~ubuntu-branches/ubuntu/vivid/webbrowser-app/vivid

« back to all changes in this revision

Viewing changes to src/app/webbrowser/settings.h

Committer: Package Import Robot
Author(s): Ubuntu daily release
Date: 2015-02-03 11:06:38 UTC
mto: This revision was merged to the branch mainline in revision 133.
Revision ID: package-import@ubuntu.com-20150203110638-d5cftxhusydy9eiw

Tags: upstream-0.23+15.04.20150203

Import upstream version 0.23+15.04.20150203

files added:
src/app/actions/OpenLinkInNewBackgroundTab.qml

files removed:
tests/autopilot/webbrowser_app/tests/test_session_save_restore.py

files modified:
src/Ubuntu/Web/ua-overrides-desktop.js

src/app/webbrowser/Browser.qml

src/app/webbrowser/BrowserTab.qml

src/app/webbrowser/settings.cpp

src/app/webbrowser/settings.h

src/app/webbrowser/webbrowser-app.cpp

src/app/webbrowser/webbrowser-app.desktop.in.in

src/app/webbrowser/webbrowser-app.qml

tests/unittests/qml/tst_BrowserTab.qml

Show diffs side-by-side

added added

removed removed

src/app/webbrowser/settings.h

const QUrl& homepage() const;

SearchEngine* searchEngine() const;

const QString& allowOpenInBackgroundTab() const;

private:

QUrl m_homepage;

SearchEngine* m_searchengine;

QString m_allowOpenInBackgroundTab; //"true" for enabled, "default" for form factor dependend behaviour (currently desktop only), anything else disables the option

};

#endif // __SETTINGS_H__

Older »