diff options
| author | erg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-16 00:22:48 +0000 |
|---|---|---|
| committer | erg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-16 00:22:48 +0000 |
| commit | d83a560943d1fdfcf9ec46ea001248a46e6148a7 (patch) | |
| tree | c046a2757bbeb25c42f2f6af300cd4098289c715 /chrome/browser/browser.h | |
| parent | 63692215e10b693db53a395a9fdefd77cf3a6fc6 (diff) | |
| download | chromium_src-d83a560943d1fdfcf9ec46ea001248a46e6148a7.zip chromium_src-d83a560943d1fdfcf9ec46ea001248a46e6148a7.tar.gz chromium_src-d83a560943d1fdfcf9ec46ea001248a46e6148a7.tar.bz2 | |
FBTF: Move Extension::LaunchContainer to extension_constants.h.
This makes browser.h not depend on extension.h.
BUG=none
TEST=compiles
Review URL: http://codereview.chromium.org/3399008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@59588 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser.h')
| -rw-r--r-- | chrome/browser/browser.h | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/chrome/browser/browser.h b/chrome/browser/browser.h index eceaa39..af9aad1 100644 --- a/chrome/browser/browser.h +++ b/chrome/browser/browser.h @@ -28,7 +28,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/extensions/extension_constants.h" #include "chrome/common/notification_registrar.h" #include "chrome/common/page_transition_types.h" #include "chrome/common/page_zoom.h" @@ -225,9 +225,10 @@ class Browser : public TabStripModelDelegate, // Open |extension| in |container|. Returns the TabContents* that was created // or NULL. - static TabContents* OpenApplication(Profile* profile, - Extension* extension, - Extension::LaunchContainer container); + static TabContents* OpenApplication( + Profile* profile, + Extension* extension, + extension_misc::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 @@ -239,7 +240,7 @@ class Browser : public TabStripModelDelegate, static TabContents* OpenApplicationWindow( Profile* profile, Extension* extension, - Extension::LaunchContainer container, + extension_misc::LaunchContainer container, const GURL& url, Browser** browser); |