Implement Browser Actions extensions....

chrome/browser/views/toolbar_view.cc

 // Copyright (c) 2009 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 "app/drag_drop_types.h"
 #include "app/gfx/canvas.h"
@@ skipping 12 matching lines @@
 #include "chrome/browser/browser_window.h"
 #include "chrome/browser/character_encoding.h"
 #include "chrome/browser/encoding_menu_controller.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/browser_theme_provider.h"
 #include "chrome/browser/user_data_manager.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/go_button.h"
 #include "chrome/browser/views/location_bar_view.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/notification_service.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/pref_service.h"
@@ skipping 103 matching lines @@
 ToolbarView::ToolbarView(Browser* browser)
     : model_(browser->toolbar_model()),
       acc_focused_view_(NULL),
       back_(NULL),
       forward_(NULL),
       reload_(NULL),
       home_(NULL),
       star_(NULL),
       location_bar_(NULL),
       go_(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(
           profiles_helper_(new GetProfilesHelper(this))) {
   browser_->command_updater()->AddCommandObserver(IDC_BACK, this);
   browser_->command_updater()->AddCommandObserver(IDC_FORWARD, this);
@@ skipping 340 matching lines @@
                      child_y, home_->GetPreferredSize().width(), child_height);
   } else {
     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 browser_actions_width = browser_actions_->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 - bookmark_menu_width -
-      app_menu_width - page_menu_width - kMenuButtonOffset - go_button_width -
-      location_x;
+      app_menu_width - page_menu_width - browser_actions_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);
 
   int next_menu_x = go_->x() + go_->width() + kMenuButtonOffset;
 
   if (bookmark_menu_) {
     bookmark_menu_->SetBounds(next_menu_x, child_y, bookmark_menu_width,
                               child_height);
     next_menu_x += bookmark_menu_width;
   }
 
+  browser_actions_->SetBounds(
+      next_menu_x, child_y, browser_actions_width, child_height);
+  next_menu_x += browser_actions_width;
+
   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);
 
   if (IsDisplayModeNormal())
@@ skipping 300 matching lines @@
 
   LoadCenterStackImages();
 
   location_bar_->SetAccessibleName(l10n_util::GetString(IDS_ACCNAME_LOCATION));
   AddChildView(location_bar_);
   location_bar_->Init();
   AddChildView(go_);
 }
 
 void ToolbarView::CreateRightSideControls(Profile* profile) {
+  browser_actions_ = new BrowserActionsContainer(profile, this);
+
   page_menu_ = new views::MenuButton(NULL, std::wstring(), this, false);
   page_menu_->SetAccessibleName(l10n_util::GetString(IDS_ACCNAME_PAGE));
   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_);
     AddChildView(bookmark_menu_);
   } else {
     bookmark_menu_ = NULL;
   }
 
   LoadRightSideControlsImages();
 
+  AddChildView(browser_actions_);
   AddChildView(page_menu_);
   AddChildView(app_menu_);
 }
 
 void ToolbarView::LoadLeftSideControlsImages() {
   ThemeProvider* tp = GetThemeProvider();
 
   SkColor color = tp->GetColor(BrowserThemeProvider::COLOR_BUTTON_BACKGROUND);
   SkBitmap* background = tp->GetBitmapNamed(IDR_THEME_BUTTON_BACKGROUND);
 
@@ skipping 192 matching lines @@
   app_menu_contents_->AddItem(IDC_ABOUT,
                               l10n_util::GetStringFUTF16(
                                   IDS_ABOUT,
                                   l10n_util::GetStringUTF16(IDS_PRODUCT_NAME)));
   app_menu_contents_->AddItemWithStringId(IDC_HELP_PAGE, IDS_HELP_PAGE);
   app_menu_contents_->AddSeparator();
   app_menu_contents_->AddItemWithStringId(IDC_EXIT, IDS_EXIT);
 
   app_menu_menu_.reset(new views::Menu2(app_menu_contents_.get()));
 }