Last couple of bits of new-frame related cleanup:

- Remove frame_util.cc, moving functions to BrowserList (endsession) and BrowserView (GetBrowserWindowForHWND)
- Tidy up interface for TabIconView model. The model now sources only the information it needs (loading state and favicon).
- Replace BrowserType class with an enum on Browser.

http://crbug.com/2320
http://crbug.com/3363

Review URL: http://codereview.chromium.org/10786

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@5596 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 9 insertions, 4 deletions

diff --git a/chrome/browser/browser.h b/chrome/browser/browser.h
index 398f5ae..4a77152 100644
--- a/chrome/browser/browser.h
+++ b/chrome/browser/browser.h
@@ -7,7 +7,6 @@
 
 #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"
@@ -35,12 +34,18 @@ 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(BrowserType::Type type, Profile* profile);
+  Browser(Type type, Profile* profile);
   ~Browser();
 
   // Creates a normal tabbed browser with the specified profile. The Browser's
@@ -69,7 +74,7 @@ class Browser : public TabStripModelDelegate,
 
   // Accessors ////////////////////////////////////////////////////////////////
 
-  BrowserType::Type type() const { return type_; }
+  Type type() const { return type_; }
   Profile* profile() const { return profile_; }
   BrowserWindow* window() const { return window_; }
   ToolbarModel* toolbar_model() { return &toolbar_model_; }
@@ -494,7 +499,7 @@ class Browser : public TabStripModelDelegate,
   // Data members /////////////////////////////////////////////////////////////
 
   // This Browser's type.
-  BrowserType::Type type_;
+  Type type_;
 
   // This Browser's profile.
   Profile* profile_;