Remove the bookmark menu.

chrome/browser/views/toolbar_view.cc

 // Copyright (c) 2010 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 "chrome/browser/views/toolbar_view.h"
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
-#include "base/command_line.h"
 #include "chrome/app/chrome_dll_resource.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/browser_theme_provider.h"
 #include "chrome/browser/browser_window.h"
 #include "chrome/browser/pref_service.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/upgrade_detector.h"
 #include "chrome/browser/view_ids.h"
-#include "chrome/browser/views/bookmark_menu_button.h"
 #include "chrome/browser/views/browser_actions_container.h"
 #include "chrome/browser/views/event_utils.h"
 #include "chrome/browser/views/frame/browser_view.h"
 #include "chrome/browser/views/wrench_menu.h"
 #include "chrome/browser/wrench_menu_model.h"
-#include "chrome/common/chrome_switches.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/common/pref_names.h"
 #include "gfx/canvas.h"
 #include "gfx/canvas_skia.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "gfx/skbitmap_operations.h"
 #include "grit/theme_resources.h"
 #include "views/controls/button/button_dropdown.h"
 #include "views/focus/view_storage.h"
@@ skipping 37 matching lines @@
 ToolbarView::ToolbarView(Browser* browser)
     : model_(browser->toolbar_model()),
       back_(NULL),
       forward_(NULL),
       home_(NULL),
       reload_(NULL),
       location_bar_(NULL),
       browser_actions_(NULL),
       page_menu_(NULL),
       app_menu_(NULL),
-      bookmark_menu_(NULL),
       profile_(NULL),
       browser_(browser),
       profiles_menu_contents_(NULL),
       ALLOW_THIS_IN_INITIALIZER_LIST(method_factory_(this)),
       destroyed_flag_(NULL),
       collapsed_(false) {
   SetID(VIEW_ID_TOOLBAR);
 
   browser_->command_updater()->AddCommandObserver(IDC_BACK, this);
   browser_->command_updater()->AddCommandObserver(IDC_FORWARD, this);
@@ skipping 75 matching lines @@
     page_menu_->SetTooltipText(l10n_util::GetString(IDS_PAGEMENU_TOOLTIP));
     page_menu_->SetID(VIEW_ID_PAGE_MENU);
   }
 
   app_menu_ = new views::MenuButton(NULL, std::wstring(), this, false);
   app_menu_->SetAccessibleName(l10n_util::GetString(IDS_ACCNAME_APP));
   app_menu_->SetTooltipText(l10n_util::GetStringF(IDS_APPMENU_TOOLTIP,
       l10n_util::GetString(IDS_PRODUCT_NAME)));
   app_menu_->SetID(VIEW_ID_APP_MENU);
 
-  if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kBookmarkMenu)) {
-    bookmark_menu_ = new BookmarkMenuButton(browser_);
-  } else {
-    bookmark_menu_ = NULL;
-  }
-
   // Catch the case where the window is created after we detect a new version.
   if (Singleton<UpgradeDetector>::get()->notify_upgrade())
     ShowUpgradeReminder();
 
   LoadImages();
 
   // Always add children in order from left to right, for accessibility.
   AddChildView(back_);
   AddChildView(forward_);
   AddChildView(home_);
   AddChildView(reload_);
   AddChildView(location_bar_);
   AddChildView(browser_actions_);
-  if (bookmark_menu_)
-    AddChildView(bookmark_menu_);
   if (page_menu_)
     AddChildView(page_menu_);
   AddChildView(app_menu_);
 
   location_bar_->Init();
   show_home_button_.Init(prefs::kShowHomeButton, profile->GetPrefs(), this);
 
   SetProfile(profile);
   if (!app_menu_model_.get()) {
     if (WrenchMenuModel::IsEnabled()) {
@@ skipping 220 matching lines @@
 
 gfx::Size ToolbarView::GetPreferredSize() {
   if (IsDisplayModeNormal()) {
     int min_width = kControlIndent + back_->GetPreferredSize().width() +
         forward_->GetPreferredSize().width() + kControlHorizOffset +
         (show_home_button_.GetValue() ?
             (home_->GetPreferredSize().width() + kControlHorizOffset) : 0) +
         reload_->GetPreferredSize().width() + kControlHorizOffset +
         browser_actions_->GetPreferredSize().width() +
         kMenuButtonOffset +
-        (bookmark_menu_ ? bookmark_menu_->GetPreferredSize().width() : 0) +
         (page_menu_ ? page_menu_->GetPreferredSize().width() : 0) +
         app_menu_->GetPreferredSize().width() + kPaddingRight;
 
     static SkBitmap normal_background;
     if (normal_background.isNull()) {
       ResourceBundle& rb = ResourceBundle::GetSharedInstance();
       normal_background = *rb.GetBitmapNamed(IDR_CONTENT_TOP_CENTER);
     }
 
     return gfx::Size(min_width,
@@ skipping 55 matching lines @@
                      child_height);
   }
 
   reload_->SetBounds(home_->x() + home_->width() + kControlHorizOffset, child_y,
                      reload_->GetPreferredSize().width(), child_height);
 
   int browser_actions_width = browser_actions_->GetPreferredSize().width();
   int page_menu_width =
       page_menu_ ? page_menu_->GetPreferredSize().width() : 0;
   int app_menu_width = app_menu_->GetPreferredSize().width();
-  int bookmark_menu_width = bookmark_menu_ ?
-      bookmark_menu_->GetPreferredSize().width() : 0;
   int location_x = reload_->x() + reload_->width() + kControlHorizOffset;
-  int available_width = width() - kPaddingRight - bookmark_menu_width -
-      app_menu_width - page_menu_width - browser_actions_width -
-      kMenuButtonOffset - location_x;
+  int available_width = width() - kPaddingRight - app_menu_width -
+      page_menu_width - browser_actions_width - kMenuButtonOffset - location_x;
 
   location_bar_->SetBounds(location_x, child_y, std::max(available_width, 0),
                            child_height);
   int next_menu_x =
       location_bar_->x() + location_bar_->width() + kMenuButtonOffset;
 
   browser_actions_->SetBounds(next_menu_x, 0, browser_actions_width, height());
   // The browser actions need to do a layout explicitly, because when an
   // extension is loaded/unloaded/changed, BrowserActionContainer removes and
   // re-adds everything, regardless of whether it has a page action. For a
   // page action, browser action bounds do not change, as a result of which
   // SetBounds does not do a layout at all.
   // TODO(sidchat): Rework the above behavior so that explicit layout is not
   //                required.
   browser_actions_->Layout();
   next_menu_x += browser_actions_width;
 
-  if (bookmark_menu_) {
-    bookmark_menu_->SetBounds(next_menu_x, child_y, bookmark_menu_width,
-                              child_height);
-    next_menu_x += bookmark_menu_width;
-  }
-
   if (page_menu_) {
     page_menu_->SetBounds(next_menu_x, child_y, page_menu_width, child_height);
     next_menu_x += page_menu_width;
   }
 
   app_menu_->SetBounds(next_menu_x, child_y, app_menu_width, child_height);
 }
 
 void ToolbarView::Paint(gfx::Canvas* canvas) {
   View::Paint(canvas);
@@ skipping 90 matching lines @@
       tp->GetBitmapNamed(IDR_STOP_P));
   reload_->SetBackground(color, background,
       tp->GetBitmapNamed(IDR_BUTTON_MASK));
 
   // We use different menu button images if the locale is right-to-left.
   if (page_menu_) {
     page_menu_->SetIcon(*tp->GetBitmapNamed(
         base::i18n::IsRTL() ? IDR_MENU_PAGE_RTL : IDR_MENU_PAGE));
   }
   app_menu_->SetIcon(GetAppMenuIcon());
-  if (bookmark_menu_ != NULL)
-    bookmark_menu_->SetIcon(*tp->GetBitmapNamed(IDR_MENU_BOOKMARK));
 }
 
 void ToolbarView::ShowUpgradeReminder() {
   update_reminder_animation_.reset(new SlideAnimation(this));
   update_reminder_animation_->SetSlideDuration(kPulseDuration);
 
   // Then start the recurring timer for pulsating it.
   upgrade_reminder_pulse_timer_.Start(
       base::TimeDelta::FromMilliseconds(kPulsateEveryMs),
       this, &ToolbarView::PulsateUpgradeNotifier);
@@ skipping 154 matching lines @@
   }
 #endif
 
   // Tell the menu button to activate, opening its pop-up menu.
   menu_button->Activate();
 
 #if defined(OS_WIN)
   SetToolbarFocus(NULL, menu_button);
 #endif
 }