Don't expose the go and star button views directly through the BrowserWindow ...

chrome/browser/views/frame/browser_view.cc

 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/command_line.h"
 
 #include "chrome/browser/views/frame/browser_view.h"
 
 #include "base/file_version_info.h"
 #include "base/time.h"
@@ skipping 12 matching lines @@
 #include "chrome/browser/views/download_shelf_view.h"
 #include "chrome/browser/views/frame/browser_frame.h"
 #include "chrome/browser/views/html_dialog_view.h"
 #include "chrome/browser/views/importer_view.h"
 #include "chrome/browser/views/infobars/infobar_container.h"
 #include "chrome/browser/views/keyword_editor_view.h"
 #include "chrome/browser/views/password_manager_view.h"
 #include "chrome/browser/views/status_bubble_views.h"
 #include "chrome/browser/views/tab_contents_container_view.h"
 #include "chrome/browser/views/tabs/tab_strip.h"
+#include "chrome/browser/views/toolbar_star_toggle.h"
 #include "chrome/browser/views/toolbar_view.h"
 #include "chrome/browser/tab_contents/navigation_entry.h"
 #include "chrome/browser/tab_contents/web_contents.h"
 #include "chrome/browser/tab_contents/web_contents_view.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/drag_drop_types.h"
 #include "chrome/common/l10n_util.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/common/os_exchange_data.h"
 #include "chrome/common/pref_names.h"
@@ skipping 20 matching lines @@
 static const int kStatusBubbleHeight = 20;
 // The overlap of the status bubble with the left edge of the window.
 static const int kStatusBubbleHorizontalOverlap = 2;
 // The overlap of the status bubble with the bottom edge of the window.
 static const int kStatusBubbleVerticalOverlap = 2;
 // An offset distance between certain toolbars and the toolbar that preceded
 // them in layout.
 static const int kSeparationLineHeight = 1;
 // The name of a key to store on the window handle so that other code can
 // locate this object using just the handle.
-static const wchar_t* kBrowserWindowKey = L"__BROWSER_WINDOW__";
+static const wchar_t* kBrowserViewKey = L"__BROWSER_VIEW__";
 // The distance between tiled windows.
 static const int kWindowTilePixels = 10;
 // How frequently we check for hung plugin windows.
 static const int kDefaultHungPluginDetectFrequency = 2000;
 // How long do we wait before we consider a window hung (in ms).
 static const int kDefaultPluginMessageResponseTimeout = 30000;
 // The number of milliseconds between loading animation frames.
 static const int kLoadingAnimationFrameTimeMs = 30;
 
 static const struct { bool separator; int command; int label; } kMenuLayout[] = {
@@ skipping 49 matching lines @@
 
 BrowserView::~BrowserView() {
   browser_->tabstrip_model()->RemoveObserver(this);
 
   // Stop hung plugin monitoring.
   ticker_.Stop();
   ticker_.UnregisterTickHandler(&hung_window_detector_);
 }
 
 // static
-BrowserWindow* BrowserView::GetBrowserWindowForHWND(HWND window) {
+BrowserView* BrowserView::GetBrowserViewForHWND(HWND window) {
   if (IsWindow(window)) {
-    HANDLE data = GetProp(window, kBrowserWindowKey);
+    HANDLE data = GetProp(window, kBrowserViewKey);
     if (data)
-      return reinterpret_cast<BrowserWindow*>(data);
+      return reinterpret_cast<BrowserView*>(data);
   }
   return NULL;
 }
 
 int BrowserView::GetShowState() const {
   STARTUPINFO si = {0};
   si.cb = sizeof(si);
   si.dwFlags = STARTF_USESHOWWINDOW;
   GetStartupInfo(&si);
   // When launched from bash, for some reason si.wShowWindow is set to SW_HIDE,
@@ skipping 158 matching lines @@
   prefs->RegisterIntegerPref(prefs::kHungPluginDetectFrequency,
                              kDefaultHungPluginDetectFrequency);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // BrowserView, BrowserWindow implementation:
 
 void BrowserView::Init() {
   // Stow a pointer to this object onto the window handle so that we can get
   // at it later when all we have is a HWND.
-  SetProp(GetWidget()->GetHWND(), kBrowserWindowKey, this);
+  SetProp(GetWidget()->GetHWND(), kBrowserViewKey, this);
 
   // Start a hung plugin window detector for this browser object (as long as
   // hang detection is not disabled).
   if (!CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kDisableHangMonitor)) {
     InitHangMonitor();
   }
 
   LoadAccelerators();
   SetAccessibleName(l10n_util::GetString(IDS_PRODUCT_NAME));
@@ skipping 79 matching lines @@
 }
 
 void* BrowserView::GetNativeHandle() {
   return GetWidget()->GetHWND();
 }
 
 BrowserWindowTesting* BrowserView::GetBrowserWindowTesting() {
   return this;
 }
 
-TabStrip* BrowserView::GetTabStrip() const {
-  return tabstrip_;
-}
-
 StatusBubble* BrowserView::GetStatusBubble() {
   return status_bubble_.get();
 }
 
 void BrowserView::SelectedTabToolbarSizeChanged(bool is_animating) {
   if (is_animating) {
     contents_container_->set_fast_resize(true);
     UpdateUIForContents(browser_->GetSelectedTabContents());
     contents_container_->set_fast_resize(false);
   } else {
@@ skipping 18 matching lines @@
     }
   } else {
     if (loading_animation_timer_.IsRunning()) {
       loading_animation_timer_.Stop();
       // Loads are now complete, update the state if a task was scheduled.
       LoadingAnimationCallback();
     }
   }
 }
 
+void BrowserView::SetStarredState(bool is_starred) {
+  toolbar_->star_button()->SetToggled(is_starred);
+}
+
 gfx::Rect BrowserView::GetNormalBounds() const {
   WINDOWPLACEMENT wp;
   wp.length = sizeof(wp);
   const bool ret = !!GetWindowPlacement(frame_->GetWindow()->GetHWND(), &wp);
   DCHECK(ret);
   return gfx::Rect(wp.rcNormalPosition);
 }
 
 bool BrowserView::IsMaximized() {
   return frame_->GetWindow()->IsMaximized();
 }
 
-ToolbarStarToggle* BrowserView::GetStarButton() const {
-  return toolbar_->star_button();
-}
-
 LocationBarView* BrowserView::GetLocationBarView() const {
   return toolbar_->GetLocationBarView();
 }
 
-GoButton* BrowserView::GetGoButton() const {
-  return toolbar_->GetGoButton();
+BrowserView* BrowserView::GetBrowserView() const {
+  return NULL;
 }
 
-BrowserView* BrowserView::GetBrowserView() const {
-  return NULL;
+void BrowserView::UpdateStopGoState(bool is_loading) {
+  toolbar_->GetGoButton()->ChangeMode(
+      is_loading ? GoButton::MODE_STOP : GoButton::MODE_GO);
 }
 
 void BrowserView::UpdateToolbar(TabContents* contents,
                                 bool should_restore_state) {
   toolbar_->Update(contents, should_restore_state);
 }
 
 void BrowserView::FocusToolbar() {
   // Do not restore the button that previously had accessibility focus, if
   // focus is set by using the toolbar focus keyboard shortcut.
@@ skipping 27 matching lines @@
 void BrowserView::ShowAboutChromeDialog() {
   views::Window::CreateChromeWindow(
       GetWidget()->GetHWND(), gfx::Rect(),
       new AboutChromeView(browser_->profile()))->Show();
 }
 
 void BrowserView::ShowBookmarkManager() {
   BookmarkManagerView::Show(browser_->profile());
 }
 
+bool BrowserView::IsBookmarkBubbleVisible() const {
+  return toolbar_->star_button()->is_bubble_showing();
+}
+
+void BrowserView::ShowBookmarkBubble(const GURL& url, bool already_bookmarked) {
+  toolbar_->star_button()->ShowStarBubble(url, !already_bookmarked);
+}
+
 void BrowserView::ShowReportBugDialog() {
   // Retrieve the URL for the current tab (if any) and tell the BugReportView
   TabContents* current_tab = browser_->GetSelectedTabContents();
   if (!current_tab)
     return;
 
   BugReportView* bug_report_view = new BugReportView(browser_->profile(),
                                                      current_tab);
 
   if (current_tab->controller()->GetLastCommittedEntry()) {
@@ skipping 819 matching lines @@
 
 // static
 void BrowserView::InitClass() {
   static bool initialized = false;
   if (!initialized) {
     ResourceBundle& rb = ResourceBundle::GetSharedInstance();
     default_favicon_ = *rb.GetBitmapNamed(IDR_DEFAULT_FAVICON);
     initialized = true;
   }
 }