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

chrome/browser/browser.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 "base/idle_timer.h"
 #include "base/logging.h"
 #include "base/string_util.h"
 #include "chrome/app/chrome_dll_resource.h"
 #include "chrome/browser/browser_list.h"
@@ skipping 41 matching lines @@
 #include "chrome/browser/status_bubble.h"
 #include "chrome/browser/tab_contents/interstitial_page.h"
 #include "chrome/browser/tab_contents/navigation_controller.h"
 #include "chrome/browser/tab_contents/navigation_entry.h"
 #include "chrome/browser/tab_contents/site_instance.h"
 #include "chrome/browser/tab_contents/web_contents_view.h"
 #include "chrome/browser/task_manager.h"
 #include "chrome/browser/user_data_manager.h"
 #include "chrome/browser/view_ids.h"
 #include "chrome/browser/views/download_tab_view.h"
-#include "chrome/browser/views/go_button.h"
 #include "chrome/browser/views/location_bar_view.h"
 #include "chrome/browser/views/new_profile_dialog.h"
 #include "chrome/browser/views/select_profile_dialog.h"
-#include "chrome/browser/views/toolbar_star_toggle.h"
 #include "chrome/browser/window_sizer.h"
 #include "chrome/common/l10n_util.h"
 #include "chrome/common/win_util.h"
 
 #include "chromium_strings.h"
 #include "generated_resources.h"
 
 #endif  // OS_WIN
 
 using base::TimeDelta;
@@ skipping 648 matching lines @@
 }
 
 void Browser::Exit() {
   UserMetrics::RecordAction(L"Exit", profile_);
   BrowserList::CloseAllBrowsers(true);
 }
 
 void Browser::BookmarkCurrentPage() {
   UserMetrics::RecordAction(L"Star", profile_);
 
-  TabContents* tab = GetSelectedTabContents();
-  if (!tab->AsWebContents())
-    return;
-
-  WebContents* rvh = tab->AsWebContents();
-  BookmarkModel* model = tab->profile()->GetBookmarkModel();
+  TabContents* contents = GetSelectedTabContents();
+  BookmarkModel* model = contents->profile()->GetBookmarkModel();
   if (!model || !model->IsLoaded())
     return;  // Ignore requests until bookmarks are loaded.
 
-  NavigationEntry* entry = rvh->controller()->GetActiveEntry();
+  NavigationEntry* entry = contents->controller()->GetActiveEntry();
   if (!entry)
     return;  // Can't star if there is no URL.
   const GURL& url = entry->display_url();
   if (url.is_empty() || !url.is_valid())
     return;
 
-  if (window_->GetStarButton()) {
-    if (!window_->GetStarButton()->is_bubble_showing()) {
-      const bool newly_bookmarked = !model->IsBookmarked(url);
-      if (newly_bookmarked) {
-        model->SetURLStarred(url, entry->title(), true);
-        if (!model->IsBookmarked(url)) {
-          // Starring failed. This shouldn't happen.
-          NOTREACHED();
-          return;
-        }
-      }
-      window_->GetStarButton()->ShowStarBubble(url, newly_bookmarked);
-    }
-  } else if (model->IsBookmarked(url)) {
-    // If we can't find the star button and the user wanted to unstar it,
-    // go ahead and unstar it without showing the bubble.
-    model->SetURLStarred(url, std::wstring(), false);
-  }
+  model->SetURLStarred(url, entry->title(), true);
+  if (!window_->IsBookmarkBubbleVisible())
+    window_->ShowBookmarkBubble(url, model->IsBookmarked(url));
 }
 
 void Browser::ViewSource() {
   UserMetrics::RecordAction(L"ViewSource", profile_);
 
   TabContents* current_tab = GetSelectedTabContents();
   NavigationEntry* entry = current_tab->controller()->GetLastCommittedEntry();
   if (entry) {
     GURL url("view-source:" + entry->url().spec());
     OpenURL(url, GURL(), NEW_FOREGROUND_TAB, PageTransition::LINK);
@@ skipping 980 matching lines @@
 
 void Browser::ToolbarSizeChanged(TabContents* source, bool is_animating) {
   if (source == GetSelectedTabContents() || source == NULL) {
     // This will refresh the shelf if needed.
     window_->SelectedTabToolbarSizeChanged(is_animating);
   }
 }
 
 void Browser::URLStarredChanged(TabContents* source, bool starred) {
   if (source == GetSelectedTabContents())
-    SetStarredButtonToggled(starred);
+    window_->SetStarredState(starred);
 }
 
 void Browser::ContentsMouseEvent(TabContents* source, UINT message) {
   if (!GetStatusBubble())
     return;
 
   if (source == GetSelectedTabContents()) {
     if (message == WM_MOUSEMOVE) {
       GetStatusBubble()->MouseMoved();
     } else if (message == WM_MOUSELEAVE) {
@@ skipping 288 matching lines @@
 
   // Initialize commands available only for web content.
   {
     WebContents* web_contents = current_tab->AsWebContents();
     bool is_web_contents = web_contents != NULL;
 
     // Page-related commands
     // Only allow bookmarking for tabbed browsers.
     command_updater_.UpdateCommandEnabled(IDC_STAR,
         is_web_contents && (type() == TYPE_NORMAL));
-    SetStarredButtonToggled(is_web_contents && web_contents->is_starred());
+    window_->SetStarredState(is_web_contents && web_contents->is_starred());
     // View-source should not be enabled if already in view-source mode.
     command_updater_.UpdateCommandEnabled(IDC_VIEW_SOURCE,
         is_web_contents && (current_tab->type() != TAB_CONTENTS_VIEW_SOURCE) &&
         current_tab->controller()->GetActiveEntry());
     command_updater_.UpdateCommandEnabled(IDC_PRINT, is_web_contents);
     command_updater_.UpdateCommandEnabled(IDC_SAVE_PAGE,
         is_web_contents && SavePackage::IsSavableURL(current_tab->GetURL()));
     command_updater_.UpdateCommandEnabled(IDC_ENCODING_MENU,
         is_web_contents &&
         SavePackage::IsSavableContents(web_contents->contents_mime_type()) &&
@@ skipping 11 matching lines @@
     command_updater_.UpdateCommandEnabled(IDC_ZOOM_MINUS, is_web_contents);
 
     // Show various bits of UI
     command_updater_.UpdateCommandEnabled(IDC_JS_CONSOLE, is_web_contents);
     command_updater_.UpdateCommandEnabled(IDC_CREATE_SHORTCUTS,
         is_web_contents && !current_tab->GetFavIcon().isNull());
   }
 }
 
 void Browser::UpdateStopGoState(bool is_loading) {
-  GoButton* go_button = GetGoButton();
-  if (go_button)
-    go_button->ChangeMode(is_loading ? GoButton::MODE_STOP : GoButton::MODE_GO);
+  window_->UpdateStopGoState(is_loading);
   command_updater_.UpdateCommandEnabled(IDC_GO, !is_loading);
   command_updater_.UpdateCommandEnabled(IDC_STOP, is_loading);
 }
 
-void Browser::SetStarredButtonToggled(bool starred) {
-  ToolbarStarToggle* star_button = window_->GetStarButton();
-  if (star_button)
-    star_button->SetToggled(starred);
-}
-
 #if defined(OS_WIN)
 
 ///////////////////////////////////////////////////////////////////////////////
 // Browser, UI update coalescing and handling (private):
 
 void Browser::UpdateToolbar(bool should_restore_state) {
   window_->UpdateToolbar(GetSelectedTabContents(), should_restore_state);
 }
 
 void Browser::ScheduleUIUpdate(const TabContents* source,
@@ skipping 119 matching lines @@
 
 #endif  // OS_WIN
 
 ///////////////////////////////////////////////////////////////////////////////
 // Browser, Getters for UI (private):
 
 LocationBarView* Browser::GetLocationBarView() const {
   return window_->GetLocationBarView();
 }
 
-GoButton* Browser::GetGoButton() {
-  return window_->GetGoButton();
-}
-
 StatusBubble* Browser::GetStatusBubble() {
   return window_->GetStatusBubble();
 }
 
 #if defined(OS_WIN)
 ///////////////////////////////////////////////////////////////////////////////
 // Browser, Session restore functions (private):
 
 void Browser::SyncHistoryWithTabs(int index) {
   if (!profile()->HasSessionService())
@@ skipping 172 matching lines @@
   std::wstring window_pref(prefs::kBrowserWindowPlacement);
   window_pref.append(L"_");
   window_pref.append(app_name);
   PrefService* prefs = g_browser_process->local_state();
   DCHECK(prefs);
 
   prefs->RegisterDictionaryPref(window_pref.c_str());
 }
 
 #endif  // OS_WIN