Rename ChromeFrame->BrowserWindow

Move static utility functions to FrameUtil class.

B=1294302


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

6 files changed, 17 insertions, 14 deletions

diff --git a/chrome/browser/views/bookmark_bar_view.cc b/chrome/browser/views/bookmark_bar_view.cc
index 9f505ed..e9dbb11 100644
--- a/chrome/browser/views/bookmark_bar_view.cc
+++ b/chrome/browser/views/bookmark_bar_view.cc
@@ -37,7 +37,7 @@
 #include "chrome/browser/browser.h"
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/browser_process.h"
-#include "chrome/browser/chrome_frame.h"
+#include "chrome/browser/browser_window.h"
 #include "chrome/browser/drag_utils.h"
 #include "chrome/browser/download_util.h"
 #include "chrome/browser/history/history_backend.h"
@@ -413,6 +413,10 @@ class EditFolderController : public InputWindowDelegate,
         l10n_util::GetString(IDS_BOOMARK_FOLDER_EDITOR_WINDOW_TITLE);
   }
 
+  virtual ChromeViews::View* GetContentsView() {
+    return view_;
+  }
+
   BookmarkBarView* view_;
 
   // If is_new is true, this is the parent to create the new node under.
@@ -1719,7 +1723,7 @@ void BookmarkBarView::RunMenu(ChromeViews::View* view,
   View::ConvertPointToScreen(this, &screen_loc);
   menu_runner_.reset(new MenuRunner(this, node, start_index));
   HWND parent_hwnd = reinterpret_cast<HWND>(
-      browser_->frame()->GetPlatformID());
+      browser_->window()->GetPlatformID());
   menu_runner_->RunMenuAt(parent_hwnd,
                           gfx::Rect(screen_loc.x, screen_loc.y,
                                     view->GetWidth(), height),
diff --git a/chrome/browser/views/first_run_bubble.cc b/chrome/browser/views/first_run_bubble.cc
index 86f9fb1..f17071c 100644
--- a/chrome/browser/views/first_run_bubble.cc
+++ b/chrome/browser/views/first_run_bubble.cc
@@ -32,7 +32,7 @@
 #include "chrome/app/locales/locale_settings.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/browser_list.h"
-#include "chrome/browser/chrome_frame.h"
+#include "chrome/browser/browser_window.h"
 #include "chrome/browser/options_window.h"
 #include "chrome/browser/standard_layout.h"
 #include "chrome/browser/template_url_model.h"
@@ -229,7 +229,7 @@ FirstRunBubble* FirstRunBubble::Show(HWND parent_hwnd,
   ChromeViews::View* view = new FirstRunBubbleView(window);
   window->SetDelegate(window);
   window->Init(parent_hwnd, position_relative_to, view);
-  ChromeFrame* frame = window->GetHostingFrame();
+  BrowserWindow* frame = window->GetHostingWindow();
   DCHECK(frame);
   frame->InfoBubbleShowing();
   window->ShowWindow(SW_SHOW);
diff --git a/chrome/browser/views/info_bubble.cc b/chrome/browser/views/info_bubble.cc
index f239684..b307a98 100644
--- a/chrome/browser/views/info_bubble.cc
+++ b/chrome/browser/views/info_bubble.cc
@@ -31,7 +31,8 @@
 
 #include "base/win_util.h"
 #include "chrome/app/theme/theme_resources.h"
-#include "chrome/browser/chrome_frame.h"
+#include "chrome/browser/browser_window.h"
+#include "chrome/browser/frame_util.h"
 #include "chrome/common/gfx/chrome_canvas.h"
 #include "chrome/common/gfx/path.h"
 #include "chrome/common/resource_bundle.h"
@@ -95,7 +96,7 @@ InfoBubble* InfoBubble::Show(HWND parent_hwnd,
                              InfoBubbleDelegate* delegate) {
   InfoBubble* window = new InfoBubble();
   window->Init(parent_hwnd, position_relative_to, content);
-  ChromeFrame* frame = window->GetHostingFrame();
+  BrowserWindow* frame = window->GetHostingWindow();
   if (frame)
     frame->InfoBubbleShowing();
   window->ShowWindow(SW_SHOW);
@@ -164,7 +165,7 @@ void InfoBubble::Init(HWND parent_hwnd,
 
 void InfoBubble::Close() {
   // We don't fade out because it looks terrible.
-  ChromeFrame* frame = GetHostingFrame();
+  BrowserWindow* frame = GetHostingWindow();
   if (delegate_)
     delegate_->InfoBubbleClosing(this);
   if (frame)
@@ -212,9 +213,9 @@ InfoBubble::ContentView* InfoBubble::CreateContentView(View* content) {
   return new ContentView(content, this);
 }
 
-ChromeFrame* InfoBubble::GetHostingFrame() {
+BrowserWindow* InfoBubble::GetHostingWindow() {
   HWND owning_frame_hwnd = GetAncestor(GetHWND(), GA_ROOTOWNER);
-  ChromeFrame* frame = ChromeFrame::GetChromeFrameForWindow(owning_frame_hwnd);
+  BrowserWindow* frame = FrameUtil::GetBrowserWindowForHWND(owning_frame_hwnd);
   if (!frame) {
     // We should always have a frame, but there was a bug else where that
     // made it possible for the frame to be NULL, so we have the check. If
diff --git a/chrome/browser/views/info_bubble.h b/chrome/browser/views/info_bubble.h
index ee4a2b3..8678428 100644
--- a/chrome/browser/views/info_bubble.h
+++ b/chrome/browser/views/info_bubble.h
@@ -42,7 +42,7 @@
 // (or rather ContentView) insets the content view for you, so that the
 // content typically shouldn't have any additional margins around the view.
 
-class ChromeFrame;
+class BrowserWindow;
 class InfoBubble;
 
 class InfoBubbleDelegate {
@@ -174,8 +174,8 @@ class InfoBubble : public ChromeViews::HWNDViewContainer,
   // Creates and return a new ContentView containing content.
   virtual ContentView* CreateContentView(ChromeViews::View* content);
 
-  // Returns the ChromeFrame that owns this InfoBubble.
-  ChromeFrame* GetHostingFrame();
+  // Returns the BrowserWindow that owns this InfoBubble.
+  BrowserWindow* GetHostingWindow();
 
  private:
   // The delegate notified when the InfoBubble is closed.
diff --git a/chrome/browser/views/toolbar_star_toggle.cc b/chrome/browser/views/toolbar_star_toggle.cc
index 36a4bb2..51f56ed 100644
--- a/chrome/browser/views/toolbar_star_toggle.cc
+++ b/chrome/browser/views/toolbar_star_toggle.cc
@@ -32,7 +32,6 @@
 #include "chrome/app/theme/theme_resources.h"
 #include "chrome/browser/bookmark_bar_model.h"
 #include "chrome/browser/browser.h"
-#include "chrome/browser/chrome_frame.h"
 #include "chrome/browser/views/bookmark_bubble_view.h"
 #include "chrome/browser/views/toolbar_view.h"
 #include "chrome/common/resource_bundle.h"
diff --git a/chrome/browser/views/toolbar_view.cc b/chrome/browser/views/toolbar_view.cc
index 7b673a3..5ac0bc3 100644
--- a/chrome/browser/views/toolbar_view.cc
+++ b/chrome/browser/views/toolbar_view.cc
@@ -38,7 +38,6 @@
 #include "chrome/browser/browser.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/character_encoding.h"
-#include "chrome/browser/chrome_frame.h"
 #include "chrome/browser/drag_utils.h"
 #include "chrome/browser/navigation_controller.h"
 #include "chrome/browser/navigation_entry.h"