summaryrefslogtreecommitdiffstats
path: root/chrome/browser/browser.h
diff options
context:
space:
mode:
authorerikkay@chromium.org <erikkay@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-28 21:21:53 +0000
committererikkay@chromium.org <erikkay@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-28 21:21:53 +0000
commitbbadaa787f4ec8a7365e499a13bf14aef3a16a06 (patch)
tree1dacfa8d358227743fa92384de27e09aeaeb4783 /chrome/browser/browser.h
parent5cec0eb314bb4936e29d9138d259a4706aeacf4f (diff)
downloadchromium_src-bbadaa787f4ec8a7365e499a13bf14aef3a16a06.zip
chromium_src-bbadaa787f4ec8a7365e499a13bf14aef3a16a06.tar.gz
chromium_src-bbadaa787f4ec8a7365e499a13bf14aef3a16a06.tar.bz2
fullscreen window app launch container
BUG=42447 TEST=none Review URL: http://codereview.chromium.org/1730013 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@45862 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser.h')
-rw-r--r--chrome/browser/browser.h27
1 files changed, 20 insertions, 7 deletions
diff --git a/chrome/browser/browser.h b/chrome/browser/browser.h
index 8c28147..2604fa3 100644
--- a/chrome/browser/browser.h
+++ b/chrome/browser/browser.h
@@ -20,6 +20,7 @@
#include "chrome/browser/tab_contents/page_navigator.h"
#include "chrome/browser/tab_contents/tab_contents_delegate.h"
#include "chrome/browser/toolbar_model.h"
+#include "chrome/common/extensions/extension.h"
#include "chrome/common/notification_registrar.h"
#include "chrome/common/page_zoom.h"
#include "gfx/rect.h"
@@ -208,24 +209,36 @@ class Browser : public TabStripModelDelegate,
static void OpenURLOffTheRecord(Profile* profile, const GURL& url);
// Open an application specified by |app_id| in the appropriate launch
- // container. Returns false if the app_id is invalid or if ExtensionsService
+ // container. Returns NULL if the app_id is invalid or if ExtensionsService
// isn't ready/available.
- static bool OpenApplication(Profile* profile, const std::string& app_id);
+ static TabContents* OpenApplication(Profile* profile,
+ const std::string& app_id);
+
+ // Open |extension| in |container|. Returns the TabContents* that was created
+ // or NULL.
+ static TabContents* OpenApplication(Profile* profile,
+ Extension* extension,
+ Extension::LaunchContainer container);
// Opens a new application window for the specified url. If |as_panel|
// is true, the application will be opened as a Browser::Type::APP_PANEL in
// app panel window, otherwise it will be opened as as either
// Browser::Type::APP a.k.a. "thin frame" (if |extension| is NULL) or
// Browser::Type::EXTENSION_APP (if |extension| is non-NULL).
- static void OpenApplicationWindow(Profile* profile, Extension* extension,
- const GURL& url, bool as_panel);
+ static TabContents* OpenApplicationWindow(
+ Profile* profile,
+ Extension* extension,
+ Extension::LaunchContainer container,
+ const GURL& url);
// Open an application for |extension| in a new application window or panel.
- static void OpenApplicationWindow(Profile* profile, Extension* extension);
+ static TabContents* OpenApplicationWindow(Profile* profile,
+ GURL& url);
// Open an application for |extension| in a new application tab. Returns
- // false if there are no appropriate existing browser windows for |profile|.
- static bool OpenApplicationTab(Profile* profile, Extension* extension);
+ // NULL if there are no appropriate existing browser windows for |profile|.
+ static TabContents* OpenApplicationTab(Profile* profile,
+ Extension* extension);
// Opens a new window and opens the bookmark manager.
static void OpenBookmarkManagerWindow(Profile* profile);