Another Frame Grab-Bag

- makes more stuff in Browser object only happen if you're using the old frames- rename BrowserWindow::Update to BrowserWindow::UpdateToolbar since that's what it does
- add window position save/restore handling to Browser- remove BrowserWindow::BrowserDidPaint
- relic from HaloFrame days- remove BrowserWindow::GetRootView - unused and exposes impl details- remove BrowserWindow::DetachFromBrowser - unused
- store BrowserView2* on HWND's property list so infobubbles can access it later- both frames (Opaque and AeroGlass) notify the BrowserView2 when they're moved so BrowserView2 can reposition the status bubble and close the autocomplete popup
- remove BrowserView2::ShowTabContents - no longer used
- remove BrowserView2::ShelfVisibilityChanged - no longer used
- remove BrowserView2::SetWindowTitle - never used
- remove BrowserView2::ProfileChanged - now called from TabSelectedAt- properly unhook infobars etc when a tab is detached

B=1031854

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

1 files changed, 15 insertions, 20 deletions

diff --git a/chrome/browser/browser_window.h b/chrome/browser/browser_window.h
index 4e011f6..c450562 100644
--- a/chrome/browser/browser_window.h
+++ b/chrome/browser/browser_window.h
@@ -67,13 +67,6 @@ class BrowserWindow {
   // default screen.
   virtual void Show(int command, bool adjust_to_fit) = 0;
 
-  // TODO(beng): REMOVE
-  // Invoked by the browser when painting occurred. This is called as a
-  // result of calling Browser::Paint()
-  // TODO(ACW) We really need a cross platform region class to replace
-  // HRGN in our APIs
-  virtual void BrowserDidPaint(HRGN region) = 0;
-
   // Closes the frame as soon as possible.  If the frame is not in a drag
   // session, it will close immediately; otherwise, it will move offscreen (so
   // events are still fired) until the drag ends, then close.
@@ -81,6 +74,8 @@ class BrowserWindow {
 
   // Return a platform dependent identifier for this frame. On Windows, this
   // returns an HWND.
+  // TODO(beng): This should go away. The Browser object and friends should not
+  //             be interacting with platform types.
   virtual void* GetPlatformID() = 0;
 
   // TODO(beng): REMOVE (obtain via BrowserFrame).
@@ -90,12 +85,10 @@ class BrowserWindow {
   // Return the status bubble associated with the frame
   virtual StatusBubble* GetStatusBubble() = 0;
 
-  // Return the RootView associated with the frame.
-  virtual ChromeViews::RootView* GetRootView() = 0;
-
   // Inform the receiving frame that the visibility of one of the shelfs/bars
   // may have changed.
-  virtual void ShelfVisibilityChanged() = 0;
+  // TODO(beng): REMOVE
+  virtual void ShelfVisibilityChanged() {}
 
   // Inform the receiving frame that an animation has progressed in the
   // selected tab.
@@ -103,13 +96,16 @@ class BrowserWindow {
 
   // Inform the frame that the selected tab favicon or title has changed. Some
   // frames may need to refresh their title bar.
+  // TODO(beng): make this pure virtual after XPFrame/VistaFrame retire.
   virtual void UpdateTitleBar() { }
 
   // Sets the title displayed in various places within the OS, such as the task
   // bar.
-  virtual void SetWindowTitle(const std::wstring& title) = 0;
+  // TODO(beng): REMOVE
+  virtual void SetWindowTitle(const std::wstring& title) {}
 
-  // Activates (brings to front) the frame. Deminiaturize the frame if needed.
+  // Activates (brings to front) the window. Restores the window from minimized
+  // state if necessary.
   virtual void Activate() = 0;
 
   // Flashes the taskbar item associated with this frame.
@@ -118,7 +114,8 @@ class BrowserWindow {
   // Makes the specified TabContents visible. If there is another TabContents
   // visible presently, this method is responsible for hiding that TabContents
   // cleanly as well.
-  virtual void ShowTabContents(TabContents* contents) = 0;
+  // TODO(beng): REMOVE
+  virtual void ShowTabContents(TabContents* contents) {}
 
   // Continue a drag gesture that began with a constrained window. When the
   // user drags a constrained window such that their mouse pointer leaves the
@@ -165,10 +162,6 @@ class BrowserWindow {
   // |content_rect|.
   virtual gfx::Rect GetBoundsForContentBounds(const gfx::Rect content_rect) = 0;
 
-  // Tel this frame to detach from the web browser. The frame should no longer
-  // notify the browser about anything.
-  virtual void DetachFromBrowser() = 0;
-
   // Invoked by the InfoBubble when it is shown/hidden. XPFrame/VistaFrame use
   // this notification to make sure they render as active even though they are
   // not active while the bubble is shown.
@@ -200,10 +193,12 @@ class BrowserWindow {
   virtual BrowserView* GetBrowserView() const = 0;
 
   // Updates the toolbar with the state for the specified |contents|.
-  virtual void Update(TabContents* contents, bool should_restore_state) = 0;
+  virtual void UpdateToolbar(TabContents* contents,
+                             bool should_restore_state) = 0;
 
   // Updates the UI with the specified Profile.
-  virtual void ProfileChanged(Profile* profile) = 0;
+  // TODO(beng): REMOVE
+  virtual void ProfileChanged(Profile* profile) {}
 
   // Focuses the toolbar (for accessibility).
   virtual void FocusToolbar() = 0;