diff options
| author | nsylvain@chromium.org <nsylvain@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-11-18 03:48:01 +0000 |
|---|---|---|
| committer | nsylvain@chromium.org <nsylvain@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-11-18 03:48:01 +0000 |
| commit | 276ae6d3b89a1b521f54277669e73ed8e548fdb1 (patch) | |
| tree | 2e81baca1aed143c3781409e2cd00aaab6608625 /chrome/browser/browser.h | |
| parent | 4c561633e8eab426db0f94f3f03543e94c57ff77 (diff) | |
| download | chromium_src-276ae6d3b89a1b521f54277669e73ed8e548fdb1.zip chromium_src-276ae6d3b89a1b521f54277669e73ed8e548fdb1.tar.gz chromium_src-276ae6d3b89a1b521f54277669e73ed8e548fdb1.tar.bz2 | |
Revert change 5596 because it broke the build
Review URL: http://codereview.chromium.org/11439
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@5598 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser.h')
| -rw-r--r-- | chrome/browser/browser.h | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/chrome/browser/browser.h b/chrome/browser/browser.h index 4a77152..398f5ae 100644 --- a/chrome/browser/browser.h +++ b/chrome/browser/browser.h @@ -7,6 +7,7 @@ #include "chrome/browser/controller.h" #include "chrome/browser/shell_dialogs.h" +#include "chrome/browser/browser_type.h" #include "chrome/browser/browser_window.h" #include "chrome/browser/session_id.h" #include "chrome/browser/tab_contents.h" @@ -34,18 +35,12 @@ class Browser : public TabStripModelDelegate, public NotificationObserver, public SelectFileDialog::Listener { public: - enum Type { - TYPE_NORMAL = 0, - TYPE_POPUP = 1, - TYPE_APP = 2 - }; - // Constructors, Creation, Showing ////////////////////////////////////////// // Creates a new browser of the given |type| and for the given |profile|. The // Browser has a NULL window after its construction, CreateBrowserWindow must // be called after configuration for window() to be valid. - Browser(Type type, Profile* profile); + Browser(BrowserType::Type type, Profile* profile); ~Browser(); // Creates a normal tabbed browser with the specified profile. The Browser's @@ -74,7 +69,7 @@ class Browser : public TabStripModelDelegate, // Accessors //////////////////////////////////////////////////////////////// - Type type() const { return type_; } + BrowserType::Type type() const { return type_; } Profile* profile() const { return profile_; } BrowserWindow* window() const { return window_; } ToolbarModel* toolbar_model() { return &toolbar_model_; } @@ -499,7 +494,7 @@ class Browser : public TabStripModelDelegate, // Data members ///////////////////////////////////////////////////////////// // This Browser's type. - Type type_; + BrowserType::Type type_; // This Browser's profile. Profile* profile_; |