summaryrefslogtreecommitdiffstats
path: root/chrome/browser/browser_init.h
diff options
context:
space:
mode:
authorerikkay@chromium.org <erikkay@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-12 17:28:56 +0000
committererikkay@chromium.org <erikkay@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-12 17:28:56 +0000
commitc28071ad39fdf60db886e6d6844da7c3331825a6 (patch)
tree89edfcbf7bd70f18191496fbefafe843316e6139 /chrome/browser/browser_init.h
parenta883f8fc702c2cb37130361b7ddc6fc86a8f2edf (diff)
downloadchromium_src-c28071ad39fdf60db886e6d6844da7c3331825a6.zip
chromium_src-c28071ad39fdf60db886e6d6844da7c3331825a6.tar.gz
chromium_src-c28071ad39fdf60db886e6d6844da7c3331825a6.tar.bz2
Support app tabs as a launch point for apps. Also, move the logic for launching into Browser for easier access by the launcher.
BUG=none TEST=none Review URL: http://codereview.chromium.org/668245 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@41441 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser_init.h')
-rw-r--r--chrome/browser/browser_init.h12
1 files changed, 8 insertions, 4 deletions
diff --git a/chrome/browser/browser_init.h b/chrome/browser/browser_init.h
index 28653f1..1f736b5 100644
--- a/chrome/browser/browser_init.h
+++ b/chrome/browser/browser_init.h
@@ -110,11 +110,15 @@ class BrowserInit {
const std::vector<GURL>& urls);
private:
- // If the process was launched with the web application command line flag,
- // e.g. --app=http://www.google.com/, opens a web application browser and
- // returns true. If there is no web application command line flag speciifed,
+ // If the process was launched with the web application command line flags,
+ // e.g. --app=http://www.google.com/ or --app_id=... return true.
+ // In this case |app_url| or |app_id| are populated if they're non-null.
+ bool IsAppLaunch(std::string* app_url, std::string* app_id);
+
+ // If IsAppLaunch is true, tries to open an application window.
+ // If the app is specified to start in a tab, or IsAppLaunch is false,
// returns false to specify default processing.
- bool OpenApplicationURL(Profile* profile);
+ bool OpenApplicationWindow(Profile* profile);
// Does the following:
// . If the user's startup pref is to restore the last session (or the