Adds a bookmark menu. This is experimental. To turn on you need...

chrome/browser/views/toolbar_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 "chrome/browser/views/toolbar_view.h"
 
 #include <string>
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/path_service.h"
 #include "chrome/app/chrome_dll_resource.h"
-#include "chrome/browser/bookmarks/bookmark_drag_data.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/character_encoding.h"
 #include "chrome/browser/drag_utils.h"
 #include "chrome/browser/metrics/user_metrics.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/tab_contents/navigation_controller.h"
 #include "chrome/browser/tab_contents/navigation_entry.h"
 #include "chrome/browser/user_data_manager.h"
+#include "chrome/browser/views/bookmark_menu_button.h"
 #include "chrome/browser/views/dom_view.h"
 #include "chrome/browser/views/go_button.h"
 #include "chrome/browser/views/location_bar_view.h"
 #include "chrome/browser/views/theme_helpers.h"
 #include "chrome/browser/views/toolbar_star_toggle.h"
 #include "chrome/browser/view_ids.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/drag_drop_types.h"
 #include "chrome/common/gfx/chrome_canvas.h"
@@ skipping 236 matching lines @@
   if (UILayoutIsRightToLeft())
     app_menu_->SetIcon(*rb.GetBitmapNamed(IDR_MENU_CHROME_RTL));
   else
     app_menu_->SetIcon(*rb.GetBitmapNamed(IDR_MENU_CHROME));
 
   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);
   AddChildView(app_menu_);
+
+  if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kBookmarkMenu)) {
+    bookmark_menu_ = new BookmarkMenuButton(browser_);
+    AddChildView(bookmark_menu_);
+  } else {
+    bookmark_menu_ = NULL;
+  }
 }
 
 void BrowserToolbarView::Layout() {
   // If we have not been initialized yet just do nothing.
   if (back_ == NULL)
     return;
 
   if (!IsDisplayModeNormal()) {
     int edge_width = (browser_->window() && browser_->window()->IsMaximized()) ?
         0 : kPopupBackgroundEdge->width();  // See Paint().
@@ skipping 35 matching lines @@
     home_->SetVisible(false);
     home_->SetBounds(reload_->x() + reload_->width(), child_y, 0, child_height);
   }
 
   star_->SetBounds(home_->x() + home_->width() + kControlHorizOffset,
                    child_y, star_->GetPreferredSize().width(), child_height);
 
   int go_button_width = go_->GetPreferredSize().width();
   int page_menu_width = page_menu_->GetPreferredSize().width();
   int app_menu_width = app_menu_->GetPreferredSize().width();
+  int bookmark_menu_width = bookmark_menu_ ?
+      bookmark_menu_->GetPreferredSize().width() : 0;
   int location_x = star_->x() + star_->width();
-  int available_width = width() - kPaddingRight - app_menu_width -
-      page_menu_width - kMenuButtonOffset - go_button_width - location_x;
+  int available_width = width() - kPaddingRight - bookmark_menu_width -
+      app_menu_width - page_menu_width - kMenuButtonOffset - go_button_width -
+      location_x;
   location_bar_->SetBounds(location_x, child_y, std::max(available_width, 0),
                            child_height);
 
   go_->SetBounds(location_bar_->x() + location_bar_->width(), child_y,
                  go_button_width, child_height);
 
   page_menu_->SetBounds(go_->x() + go_->width() + kMenuButtonOffset, child_y,
                         page_menu_width, child_height);
 
   app_menu_->SetBounds(page_menu_->x() + page_menu_->width(), child_y,
                        app_menu_width, child_height);
+
+  if (bookmark_menu_) {
+    bookmark_menu_->SetBounds(app_menu_->x() + app_menu_->width(), child_y,
+                              bookmark_menu_width, child_height);
+  }
 }
 
 void BrowserToolbarView::Paint(ChromeCanvas* canvas) {
   View::Paint(canvas);
 
   if (IsDisplayModeNormal())
     return;
 
   // In maximized mode, we don't draw the endcaps on the location bar, because
   // when they're flush against the edge of the screen they just look glitchy.
@@ skipping 491 matching lines @@
     case IDC_COPY:
       *accel = views::Accelerator(L'C', false, true, false);
       return true;
     case IDC_PASTE:
       *accel = views::Accelerator(L'V', false, true, false);
       return true;
   }
   // Else, we retrieve the accelerator information from the frame.
   return GetWidget()->GetAccelerator(id, accel);
 }