From 424c553c045cfe39c917119d5c36e038b7c41fc7 Mon Sep 17 00:00:00 2001 From: tfarina Date: Tue, 20 Oct 2015 17:16:03 -0700 Subject: [PATCH] chrome: Rename WrenchToolbarButton to AppMenuButton. It is not a wrench button for a long time now, the new icon is a sideways ellipsis called browser_tools. BUG=None R=pkasting@chromium.org TBR=thestig@chromium.org # for gypi change Review URL: https://codereview.chromium.org/1407353006 Cr-Commit-Position: refs/heads/master@{#355195} --- .../views/accessibility/invert_bubble_view.cc | 2 +- .../autofill/new_credit_card_bubble_views.cc | 2 +- .../extensions/bundle_installed_bubble.cc | 2 +- ...xtension_action_platform_delegate_views.cc | 4 +- .../extension_installed_bubble_view.cc | 2 +- ...tension_message_bubble_view_browsertest.cc | 2 +- chrome/browser/ui/views/frame/browser_view.cc | 2 +- .../ui/views/global_error_bubble_view.cc | 2 +- .../ui/views/keyboard_access_browsertest.cc | 6 +- .../media_router_ui_browsertest.cc | 6 +- .../ui/views/network_profile_bubble_view.cc | 2 +- .../profiles/profile_reset_bubble_view.cc | 2 +- .../ui/views/session_crashed_bubble_view.cc | 2 +- .../views/settings_api_bubble_helper_views.cc | 2 +- ...h_toolbar_button.cc => app_menu_button.cc} | 58 +++++++++---------- ...nch_toolbar_button.h => app_menu_button.h} | 21 ++++--- .../toolbar/browser_action_test_util_views.cc | 2 +- .../toolbar/browser_actions_container.cc | 2 +- ...a_router_action_platform_delegate_views.cc | 4 +- .../toolbar_action_view_interactive_uitest.cc | 6 +- .../browser/ui/views/toolbar/toolbar_view.cc | 4 +- .../browser/ui/views/toolbar/toolbar_view.h | 8 +-- .../toolbar_view_interactive_uitest.cc | 6 +- chrome/chrome_browser_ui.gypi | 4 +- 24 files changed, 76 insertions(+), 77 deletions(-) rename chrome/browser/ui/views/toolbar/{wrench_toolbar_button.cc => app_menu_button.cc} (81%) rename chrome/browser/ui/views/toolbar/{wrench_toolbar_button.h => app_menu_button.h} (84%) diff --git a/chrome/browser/ui/views/accessibility/invert_bubble_view.cc b/chrome/browser/ui/views/accessibility/invert_bubble_view.cc index 3bc4843f3dfc77..af5bae20ca8df2 100644 --- a/chrome/browser/ui/views/accessibility/invert_bubble_view.cc +++ b/chrome/browser/ui/views/accessibility/invert_bubble_view.cc @@ -8,8 +8,8 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/views/frame/browser_view.h" +#include "chrome/browser/ui/views/toolbar/app_menu_button.h" #include "chrome/browser/ui/views/toolbar/toolbar_view.h" -#include "chrome/browser/ui/views/toolbar/wrench_toolbar_button.h" #include "chrome/common/pref_names.h" #include "chrome/grit/generated_resources.h" #include "content/public/browser/page_navigator.h" diff --git a/chrome/browser/ui/views/autofill/new_credit_card_bubble_views.cc b/chrome/browser/ui/views/autofill/new_credit_card_bubble_views.cc index 63ae8d7a0d1bfe..7810c0880deb1b 100644 --- a/chrome/browser/ui/views/autofill/new_credit_card_bubble_views.cc +++ b/chrome/browser/ui/views/autofill/new_credit_card_bubble_views.cc @@ -9,8 +9,8 @@ #include "chrome/browser/ui/browser_finder.h" #include "chrome/browser/ui/host_desktop.h" #include "chrome/browser/ui/views/frame/browser_view.h" +#include "chrome/browser/ui/views/toolbar/app_menu_button.h" #include "chrome/browser/ui/views/toolbar/toolbar_view.h" -#include "chrome/browser/ui/views/toolbar/wrench_toolbar_button.h" #include "ui/gfx/geometry/insets.h" #include "ui/gfx/geometry/size.h" #include "ui/views/bubble/bubble_frame_view.h" diff --git a/chrome/browser/ui/views/extensions/bundle_installed_bubble.cc b/chrome/browser/ui/views/extensions/bundle_installed_bubble.cc index 0938ae9681b5a2..c9ff7750f47de0 100644 --- a/chrome/browser/ui/views/extensions/bundle_installed_bubble.cc +++ b/chrome/browser/ui/views/extensions/bundle_installed_bubble.cc @@ -5,8 +5,8 @@ #include "chrome/browser/extensions/bundle_installer.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/views/frame/browser_view.h" +#include "chrome/browser/ui/views/toolbar/app_menu_button.h" #include "chrome/browser/ui/views/toolbar/toolbar_view.h" -#include "chrome/browser/ui/views/toolbar/wrench_toolbar_button.h" #include "ui/base/resource/resource_bundle.h" #include "ui/resources/grit/ui_resources.h" #include "ui/views/bubble/bubble_delegate.h" diff --git a/chrome/browser/ui/views/extensions/extension_action_platform_delegate_views.cc b/chrome/browser/ui/views/extensions/extension_action_platform_delegate_views.cc index abba8665b67c3c..27bb3a702f115c 100644 --- a/chrome/browser/ui/views/extensions/extension_action_platform_delegate_views.cc +++ b/chrome/browser/ui/views/extensions/extension_action_platform_delegate_views.cc @@ -11,10 +11,10 @@ #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/extensions/accelerator_priority.h" #include "chrome/browser/ui/views/frame/browser_view.h" +#include "chrome/browser/ui/views/toolbar/app_menu_button.h" #include "chrome/browser/ui/views/toolbar/browser_actions_container.h" #include "chrome/browser/ui/views/toolbar/toolbar_action_view_delegate_views.h" #include "chrome/browser/ui/views/toolbar/toolbar_view.h" -#include "chrome/browser/ui/views/toolbar/wrench_toolbar_button.h" #include "chrome/common/extensions/api/extension_action/action_info.h" #include "chrome/common/extensions/command.h" #include "content/public/browser/notification_details.h" @@ -89,7 +89,7 @@ void ExtensionActionPlatformDelegateViews::ShowPopup( } void ExtensionActionPlatformDelegateViews::CloseOverflowMenu() { - WrenchToolbarButton* app_menu_button = + AppMenuButton* app_menu_button = BrowserView::GetBrowserViewForBrowser(controller_->browser()) ->toolbar() ->app_menu_button(); diff --git a/chrome/browser/ui/views/extensions/extension_installed_bubble_view.cc b/chrome/browser/ui/views/extensions/extension_installed_bubble_view.cc index b8e12373e92466..e06a3567edc3df 100644 --- a/chrome/browser/ui/views/extensions/extension_installed_bubble_view.cc +++ b/chrome/browser/ui/views/extensions/extension_installed_bubble_view.cc @@ -23,10 +23,10 @@ #include "chrome/browser/ui/views/location_bar/location_bar_view.h" #include "chrome/browser/ui/views/location_bar/page_action_with_badge_view.h" #include "chrome/browser/ui/views/tabs/tab_strip.h" +#include "chrome/browser/ui/views/toolbar/app_menu_button.h" #include "chrome/browser/ui/views/toolbar/browser_actions_container.h" #include "chrome/browser/ui/views/toolbar/toolbar_action_view.h" #include "chrome/browser/ui/views/toolbar/toolbar_view.h" -#include "chrome/browser/ui/views/toolbar/wrench_toolbar_button.h" #include "chrome/common/extensions/sync_helper.h" #include "chrome/common/url_constants.h" #include "chrome/grit/chromium_strings.h" diff --git a/chrome/browser/ui/views/extensions/extension_message_bubble_view_browsertest.cc b/chrome/browser/ui/views/extensions/extension_message_bubble_view_browsertest.cc index 2933fd75d8e2c2..e2bb2886436011 100644 --- a/chrome/browser/ui/views/extensions/extension_message_bubble_view_browsertest.cc +++ b/chrome/browser/ui/views/extensions/extension_message_bubble_view_browsertest.cc @@ -5,9 +5,9 @@ #include "chrome/browser/ui/extensions/extension_message_bubble_browsertest.h" #include "chrome/browser/ui/views/extensions/extension_message_bubble_view.h" #include "chrome/browser/ui/views/frame/browser_view.h" +#include "chrome/browser/ui/views/toolbar/app_menu_button.h" #include "chrome/browser/ui/views/toolbar/browser_actions_container.h" #include "chrome/browser/ui/views/toolbar/toolbar_view.h" -#include "chrome/browser/ui/views/toolbar/wrench_toolbar_button.h" namespace { diff --git a/chrome/browser/ui/views/frame/browser_view.cc b/chrome/browser/ui/views/frame/browser_view.cc index bea29703cbf297..f673d12e1ff81d 100644 --- a/chrome/browser/ui/views/frame/browser_view.cc +++ b/chrome/browser/ui/views/frame/browser_view.cc @@ -86,10 +86,10 @@ #include "chrome/browser/ui/views/tabs/browser_tab_strip_controller.h" #include "chrome/browser/ui/views/tabs/tab.h" #include "chrome/browser/ui/views/tabs/tab_strip.h" +#include "chrome/browser/ui/views/toolbar/app_menu_button.h" #include "chrome/browser/ui/views/toolbar/browser_actions_container.h" #include "chrome/browser/ui/views/toolbar/reload_button.h" #include "chrome/browser/ui/views/toolbar/toolbar_view.h" -#include "chrome/browser/ui/views/toolbar/wrench_toolbar_button.h" #include "chrome/browser/ui/views/translate/translate_bubble_view.h" #include "chrome/browser/ui/views/update_recommended_message_box.h" #include "chrome/browser/ui/views/website_settings/permissions_bubble_view.h" diff --git a/chrome/browser/ui/views/global_error_bubble_view.cc b/chrome/browser/ui/views/global_error_bubble_view.cc index c34d388cf48d2f..90d6efa4918270 100644 --- a/chrome/browser/ui/views/global_error_bubble_view.cc +++ b/chrome/browser/ui/views/global_error_bubble_view.cc @@ -12,8 +12,8 @@ #include "chrome/browser/ui/global_error/global_error_service_factory.h" #include "chrome/browser/ui/views/elevation_icon_setter.h" #include "chrome/browser/ui/views/frame/browser_view.h" +#include "chrome/browser/ui/views/toolbar/app_menu_button.h" #include "chrome/browser/ui/views/toolbar/toolbar_view.h" -#include "chrome/browser/ui/views/toolbar/wrench_toolbar_button.h" #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/image/image.h" #include "ui/views/bubble/bubble_frame_view.h" diff --git a/chrome/browser/ui/views/keyboard_access_browsertest.cc b/chrome/browser/ui/views/keyboard_access_browsertest.cc index deb8050e36f6bb..1e9939c82fbea7 100644 --- a/chrome/browser/ui/views/keyboard_access_browsertest.cc +++ b/chrome/browser/ui/views/keyboard_access_browsertest.cc @@ -15,8 +15,8 @@ #include "chrome/browser/ui/browser_window.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" #include "chrome/browser/ui/views/frame/browser_view.h" +#include "chrome/browser/ui/views/toolbar/app_menu_button.h" #include "chrome/browser/ui/views/toolbar/toolbar_view.h" -#include "chrome/browser/ui/views/toolbar/wrench_toolbar_button.h" #include "chrome/test/base/in_process_browser_test.h" #include "chrome/test/base/interactive_test_utils.h" #include "chrome/test/base/ui_test_utils.h" @@ -82,7 +82,7 @@ class ViewFocusChangeWaiter : public views::FocusChangeListener { class SendKeysMenuListener : public views::MenuListener { public: - SendKeysMenuListener(WrenchToolbarButton* app_menu_button, + SendKeysMenuListener(AppMenuButton* app_menu_button, Browser* browser, bool test_dismiss_menu) : app_menu_button_(app_menu_button), @@ -118,7 +118,7 @@ class SendKeysMenuListener : public views::MenuListener { } } - WrenchToolbarButton* app_menu_button_; + AppMenuButton* app_menu_button_; Browser* browser_; // Keeps track of the number of times the menu was opened. int menu_open_count_; diff --git a/chrome/browser/ui/views/media_router/media_router_ui_browsertest.cc b/chrome/browser/ui/views/media_router/media_router_ui_browsertest.cc index 4af054d1db9ad5..060f8ec87e38ae 100644 --- a/chrome/browser/ui/views/media_router/media_router_ui_browsertest.cc +++ b/chrome/browser/ui/views/media_router/media_router_ui_browsertest.cc @@ -10,10 +10,10 @@ #include "chrome/browser/ui/toolbar/media_router_action.h" #include "chrome/browser/ui/toolbar/toolbar_action_view_delegate.h" #include "chrome/browser/ui/views/frame/browser_view.h" +#include "chrome/browser/ui/views/toolbar/app_menu_button.h" #include "chrome/browser/ui/views/toolbar/browser_actions_container.h" #include "chrome/browser/ui/views/toolbar/toolbar_action_view.h" #include "chrome/browser/ui/views/toolbar/toolbar_view.h" -#include "chrome/browser/ui/views/toolbar/wrench_toolbar_button.h" #include "chrome/common/url_constants.h" #include "chrome/test/base/in_process_browser_test.h" #include "chrome/test/base/ui_test_utils.h" @@ -55,7 +55,7 @@ class MediaRouterUIBrowserTest : public InProcessBrowserTest { content::TestNavigationObserver nav_observer(NULL); nav_observer.StartWatchingNewWebContents(); - WrenchToolbarButton* app_menu_button = + AppMenuButton* app_menu_button = BrowserView::GetBrowserViewForBrowser(browser()) ->toolbar() ->app_menu_button(); @@ -75,7 +75,7 @@ class MediaRouterUIBrowserTest : public InProcessBrowserTest { nav_observer.StopWatchingNewWebContents(); } - void ExecuteMediaRouterAction(WrenchToolbarButton* app_menu_button) { + void ExecuteMediaRouterAction(AppMenuButton* app_menu_button) { EXPECT_TRUE(app_menu_button->IsMenuShowing()); media_router_action_->ExecuteAction(true); } diff --git a/chrome/browser/ui/views/network_profile_bubble_view.cc b/chrome/browser/ui/views/network_profile_bubble_view.cc index 87c96826545a09..bc4551c5bc057d 100644 --- a/chrome/browser/ui/views/network_profile_bubble_view.cc +++ b/chrome/browser/ui/views/network_profile_bubble_view.cc @@ -9,8 +9,8 @@ #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/network_profile_bubble.h" #include "chrome/browser/ui/views/frame/browser_view.h" +#include "chrome/browser/ui/views/toolbar/app_menu_button.h" #include "chrome/browser/ui/views/toolbar/toolbar_view.h" -#include "chrome/browser/ui/views/toolbar/wrench_toolbar_button.h" #include "chrome/common/pref_names.h" #include "chrome/grit/chromium_strings.h" #include "chrome/grit/generated_resources.h" diff --git a/chrome/browser/ui/views/profiles/profile_reset_bubble_view.cc b/chrome/browser/ui/views/profiles/profile_reset_bubble_view.cc index 4a682843f34afc..8aaed74cdc018c 100644 --- a/chrome/browser/ui/views/profiles/profile_reset_bubble_view.cc +++ b/chrome/browser/ui/views/profiles/profile_reset_bubble_view.cc @@ -10,8 +10,8 @@ #include "chrome/browser/ui/global_error/global_error_service.h" #include "chrome/browser/ui/global_error/global_error_service_factory.h" #include "chrome/browser/ui/views/frame/browser_view.h" +#include "chrome/browser/ui/views/toolbar/app_menu_button.h" #include "chrome/browser/ui/views/toolbar/toolbar_view.h" -#include "chrome/browser/ui/views/toolbar/wrench_toolbar_button.h" #include "chrome/common/url_constants.h" #include "components/google/core/browser/google_util.h" #include "content/public/browser/page_navigator.h" diff --git a/chrome/browser/ui/views/session_crashed_bubble_view.cc b/chrome/browser/ui/views/session_crashed_bubble_view.cc index 79f2667779962a..7b1060ed4e06a7 100644 --- a/chrome/browser/ui/views/session_crashed_bubble_view.cc +++ b/chrome/browser/ui/views/session_crashed_bubble_view.cc @@ -23,8 +23,8 @@ #include "chrome/browser/ui/startup/startup_browser_creator_impl.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" #include "chrome/browser/ui/views/frame/browser_view.h" +#include "chrome/browser/ui/views/toolbar/app_menu_button.h" #include "chrome/browser/ui/views/toolbar/toolbar_view.h" -#include "chrome/browser/ui/views/toolbar/wrench_toolbar_button.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/pref_names.h" #include "chrome/common/url_constants.h" diff --git a/chrome/browser/ui/views/settings_api_bubble_helper_views.cc b/chrome/browser/ui/views/settings_api_bubble_helper_views.cc index d42e461ea792c6..b1eb80e93ddc71 100644 --- a/chrome/browser/ui/views/settings_api_bubble_helper_views.cc +++ b/chrome/browser/ui/views/settings_api_bubble_helper_views.cc @@ -12,9 +12,9 @@ #include "chrome/browser/ui/views/extensions/extension_message_bubble_view.h" #include "chrome/browser/ui/views/frame/browser_view.h" #include "chrome/browser/ui/views/settings_api_bubble_helper_views.h" +#include "chrome/browser/ui/views/toolbar/app_menu_button.h" #include "chrome/browser/ui/views/toolbar/home_button.h" #include "chrome/browser/ui/views/toolbar/toolbar_view.h" -#include "chrome/browser/ui/views/toolbar/wrench_toolbar_button.h" #include "chrome/common/extensions/manifest_handlers/settings_overrides_handler.h" #include "chrome/common/url_constants.h" #include "content/public/browser/browser_url_handler.h" diff --git a/chrome/browser/ui/views/toolbar/wrench_toolbar_button.cc b/chrome/browser/ui/views/toolbar/app_menu_button.cc similarity index 81% rename from chrome/browser/ui/views/toolbar/wrench_toolbar_button.cc rename to chrome/browser/ui/views/toolbar/app_menu_button.cc index 9c815d0cb193d7..5f3031fa56a73c 100644 --- a/chrome/browser/ui/views/toolbar/wrench_toolbar_button.cc +++ b/chrome/browser/ui/views/toolbar/app_menu_button.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/ui/views/toolbar/wrench_toolbar_button.h" +#include "chrome/browser/ui/views/toolbar/app_menu_button.h" #include "base/location.h" #include "base/single_thread_task_runner.h" @@ -32,9 +32,9 @@ #include "ui/views/painter.h" // static -bool WrenchToolbarButton::g_open_app_immediately_for_testing = false; +bool AppMenuButton::g_open_app_immediately_for_testing = false; -WrenchToolbarButton::WrenchToolbarButton(ToolbarView* toolbar_view) +AppMenuButton::AppMenuButton(ToolbarView* toolbar_view) : views::MenuButton(NULL, base::string16(), toolbar_view, false), severity_(WrenchIconPainter::SEVERITY_NONE), ink_drop_animation_controller_( @@ -61,13 +61,13 @@ WrenchToolbarButton::WrenchToolbarButton(ToolbarView* toolbar_view) kInkDropSmallCornerRadius); } -WrenchToolbarButton::~WrenchToolbarButton() { +AppMenuButton::~AppMenuButton() { if (destroyed_) *destroyed_ = true; } -void WrenchToolbarButton::SetSeverity(WrenchIconPainter::Severity severity, - bool animate) { +void AppMenuButton::SetSeverity(WrenchIconPainter::Severity severity, + bool animate) { if (ui::MaterialDesignController::IsModeMaterial()) { severity_ = severity; UpdateIcon(); @@ -78,7 +78,7 @@ void WrenchToolbarButton::SetSeverity(WrenchIconPainter::Severity severity, SchedulePaint(); } -void WrenchToolbarButton::ShowMenu(bool for_drop) { +void AppMenuButton::ShowMenu(bool for_drop) { if (menu_ && menu_->IsShowing()) return; @@ -118,25 +118,25 @@ void WrenchToolbarButton::ShowMenu(bool for_drop) { } } -void WrenchToolbarButton::CloseMenu() { +void AppMenuButton::CloseMenu() { if (menu_) menu_->CloseMenu(); menu_.reset(); } -bool WrenchToolbarButton::IsMenuShowing() const { +bool AppMenuButton::IsMenuShowing() const { return menu_ && menu_->IsShowing(); } -void WrenchToolbarButton::AddMenuListener(views::MenuListener* listener) { +void AppMenuButton::AddMenuListener(views::MenuListener* listener) { menu_listeners_.AddObserver(listener); } -void WrenchToolbarButton::RemoveMenuListener(views::MenuListener* listener) { +void AppMenuButton::RemoveMenuListener(views::MenuListener* listener) { menu_listeners_.RemoveObserver(listener); } -gfx::Size WrenchToolbarButton::GetPreferredSize() const { +gfx::Size AppMenuButton::GetPreferredSize() const { if (ui::MaterialDesignController::IsModeMaterial()) { gfx::Size size(image()->GetPreferredSize()); ui::ThemeProvider* provider = GetThemeProvider(); @@ -151,11 +151,11 @@ gfx::Size WrenchToolbarButton::GetPreferredSize() const { GetImageSkiaNamed(IDR_TOOLBAR_BEZEL_HOVER)->size(); } -void WrenchToolbarButton::ScheduleWrenchIconPaint() { +void AppMenuButton::ScheduleWrenchIconPaint() { SchedulePaint(); } -void WrenchToolbarButton::UpdateIcon() { +void AppMenuButton::UpdateIcon() { DCHECK(ui::MaterialDesignController::IsModeMaterial()); SkColor color = SK_ColorRED; switch (severity_) { @@ -181,7 +181,7 @@ void WrenchToolbarButton::UpdateIcon() { color)); } -void WrenchToolbarButton::AddInkDropLayer(ui::Layer* ink_drop_layer) { +void AppMenuButton::AddInkDropLayer(ui::Layer* ink_drop_layer) { SetPaintToLayer(true); image()->SetPaintToLayer(true); image()->SetFillsBoundsOpaquely(false); @@ -190,7 +190,7 @@ void WrenchToolbarButton::AddInkDropLayer(ui::Layer* ink_drop_layer) { layer()->StackAtBottom(ink_drop_layer); } -void WrenchToolbarButton::RemoveInkDropLayer(ui::Layer* ink_drop_layer) { +void AppMenuButton::RemoveInkDropLayer(ui::Layer* ink_drop_layer) { layer()->Remove(ink_drop_layer); image()->SetFillsBoundsOpaquely(true); @@ -198,11 +198,11 @@ void WrenchToolbarButton::RemoveInkDropLayer(ui::Layer* ink_drop_layer) { SetPaintToLayer(false); } -const char* WrenchToolbarButton::GetClassName() const { - return "WrenchToolbarButton"; +const char* AppMenuButton::GetClassName() const { + return "AppMenuButton"; } -bool WrenchToolbarButton::GetDropFormats( +bool AppMenuButton::GetDropFormats( int* formats, std::set* format_types) { return allow_extension_dragging_ ? @@ -210,20 +210,20 @@ bool WrenchToolbarButton::GetDropFormats( views::View::GetDropFormats(formats, format_types); } -bool WrenchToolbarButton::AreDropTypesRequired() { +bool AppMenuButton::AreDropTypesRequired() { return allow_extension_dragging_ ? BrowserActionDragData::AreDropTypesRequired() : views::View::AreDropTypesRequired(); } -bool WrenchToolbarButton::CanDrop(const ui::OSExchangeData& data) { +bool AppMenuButton::CanDrop(const ui::OSExchangeData& data) { return allow_extension_dragging_ ? BrowserActionDragData::CanDrop(data, toolbar_view_->browser()->profile()) : views::View::CanDrop(data); } -void WrenchToolbarButton::Layout() { +void AppMenuButton::Layout() { MenuButton::Layout(); // ToolbarView extends the bounds of the app button to the right in maximized @@ -233,35 +233,35 @@ void WrenchToolbarButton::Layout() { gfx::Rect(GetPreferredSize()).CenterPoint()); } -void WrenchToolbarButton::OnDragEntered(const ui::DropTargetEvent& event) { +void AppMenuButton::OnDragEntered(const ui::DropTargetEvent& event) { DCHECK(allow_extension_dragging_); DCHECK(!weak_factory_.HasWeakPtrs()); if (!g_open_app_immediately_for_testing) { base::ThreadTaskRunnerHandle::Get()->PostDelayedTask( - FROM_HERE, base::Bind(&WrenchToolbarButton::ShowMenu, - weak_factory_.GetWeakPtr(), true), + FROM_HERE, + base::Bind(&AppMenuButton::ShowMenu, weak_factory_.GetWeakPtr(), true), base::TimeDelta::FromMilliseconds(views::GetMenuShowDelay())); } else { ShowMenu(true); } } -int WrenchToolbarButton::OnDragUpdated(const ui::DropTargetEvent& event) { +int AppMenuButton::OnDragUpdated(const ui::DropTargetEvent& event) { DCHECK(allow_extension_dragging_); return ui::DragDropTypes::DRAG_MOVE; } -void WrenchToolbarButton::OnDragExited() { +void AppMenuButton::OnDragExited() { DCHECK(allow_extension_dragging_); weak_factory_.InvalidateWeakPtrs(); } -int WrenchToolbarButton::OnPerformDrop(const ui::DropTargetEvent& event) { +int AppMenuButton::OnPerformDrop(const ui::DropTargetEvent& event) { DCHECK(allow_extension_dragging_); return ui::DragDropTypes::DRAG_MOVE; } -void WrenchToolbarButton::OnPaint(gfx::Canvas* canvas) { +void AppMenuButton::OnPaint(gfx::Canvas* canvas) { views::MenuButton::OnPaint(canvas); if (ui::MaterialDesignController::IsModeMaterial()) return; diff --git a/chrome/browser/ui/views/toolbar/wrench_toolbar_button.h b/chrome/browser/ui/views/toolbar/app_menu_button.h similarity index 84% rename from chrome/browser/ui/views/toolbar/wrench_toolbar_button.h rename to chrome/browser/ui/views/toolbar/app_menu_button.h index 0f845ca61cb1cd..d0cd1706815489 100644 --- a/chrome/browser/ui/views/toolbar/wrench_toolbar_button.h +++ b/chrome/browser/ui/views/toolbar/app_menu_button.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_BROWSER_UI_VIEWS_TOOLBAR_WRENCH_TOOLBAR_BUTTON_H_ -#define CHROME_BROWSER_UI_VIEWS_TOOLBAR_WRENCH_TOOLBAR_BUTTON_H_ +#ifndef CHROME_BROWSER_UI_VIEWS_TOOLBAR_APP_MENU_BUTTON_H_ +#define CHROME_BROWSER_UI_VIEWS_TOOLBAR_APP_MENU_BUTTON_H_ #include "base/macros.h" #include "base/memory/scoped_ptr.h" @@ -25,13 +25,12 @@ class MenuListener; class ToolbarView; -// TODO(gbillock): Rename this? No longer a wrench. -class WrenchToolbarButton : public views::InkDropHost, - public views::MenuButton, - public WrenchIconPainter::Delegate { +class AppMenuButton : public views::InkDropHost, + public views::MenuButton, + public WrenchIconPainter::Delegate { public: - explicit WrenchToolbarButton(ToolbarView* toolbar_view); - ~WrenchToolbarButton() override; + explicit AppMenuButton(ToolbarView* toolbar_view); + ~AppMenuButton() override; void SetSeverity(WrenchIconPainter::Severity severity, bool animate); @@ -116,9 +115,9 @@ class WrenchToolbarButton : public views::InkDropHost, bool* destroyed_; // Used to spawn weak pointers for delayed tasks to open the overflow menu. - base::WeakPtrFactory weak_factory_; + base::WeakPtrFactory weak_factory_; - DISALLOW_COPY_AND_ASSIGN(WrenchToolbarButton); + DISALLOW_COPY_AND_ASSIGN(AppMenuButton); }; -#endif // CHROME_BROWSER_UI_VIEWS_TOOLBAR_WRENCH_TOOLBAR_BUTTON_H_ +#endif // CHROME_BROWSER_UI_VIEWS_TOOLBAR_APP_MENU_BUTTON_H_ diff --git a/chrome/browser/ui/views/toolbar/browser_action_test_util_views.cc b/chrome/browser/ui/views/toolbar/browser_action_test_util_views.cc index 9da3406c33ac8d..fe5d30e9a84436 100644 --- a/chrome/browser/ui/views/toolbar/browser_action_test_util_views.cc +++ b/chrome/browser/ui/views/toolbar/browser_action_test_util_views.cc @@ -10,10 +10,10 @@ #include "chrome/browser/ui/extensions/extension_action_view_controller.h" #include "chrome/browser/ui/views/extensions/extension_popup.h" #include "chrome/browser/ui/views/frame/browser_view.h" +#include "chrome/browser/ui/views/toolbar/app_menu_button.h" #include "chrome/browser/ui/views/toolbar/browser_actions_container.h" #include "chrome/browser/ui/views/toolbar/toolbar_action_view.h" #include "chrome/browser/ui/views/toolbar/toolbar_view.h" -#include "chrome/browser/ui/views/toolbar/wrench_toolbar_button.h" #include "ui/aura/window.h" #include "ui/gfx/geometry/rect.h" #include "ui/gfx/geometry/size.h" diff --git a/chrome/browser/ui/views/toolbar/browser_actions_container.cc b/chrome/browser/ui/views/toolbar/browser_actions_container.cc index 7cc144d7e97a84..5b4c50dd60843f 100644 --- a/chrome/browser/ui/views/toolbar/browser_actions_container.cc +++ b/chrome/browser/ui/views/toolbar/browser_actions_container.cc @@ -20,9 +20,9 @@ #include "chrome/browser/ui/views/extensions/extension_message_bubble_view.h" #include "chrome/browser/ui/views/extensions/extension_toolbar_icon_surfacing_bubble_views.h" #include "chrome/browser/ui/views/frame/browser_view.h" +#include "chrome/browser/ui/views/toolbar/app_menu_button.h" #include "chrome/browser/ui/views/toolbar/browser_actions_container_observer.h" #include "chrome/browser/ui/views/toolbar/toolbar_view.h" -#include "chrome/browser/ui/views/toolbar/wrench_toolbar_button.h" #include "chrome/common/extensions/command.h" #include "chrome/grit/generated_resources.h" #include "extensions/common/feature_switch.h" diff --git a/chrome/browser/ui/views/toolbar/media_router_action_platform_delegate_views.cc b/chrome/browser/ui/views/toolbar/media_router_action_platform_delegate_views.cc index f920c31e3dd46e..9dd1af16432925 100644 --- a/chrome/browser/ui/views/toolbar/media_router_action_platform_delegate_views.cc +++ b/chrome/browser/ui/views/toolbar/media_router_action_platform_delegate_views.cc @@ -5,8 +5,8 @@ #include "chrome/browser/ui/views/toolbar/media_router_action_platform_delegate_views.h" #include "chrome/browser/ui/views/frame/browser_view.h" +#include "chrome/browser/ui/views/toolbar/app_menu_button.h" #include "chrome/browser/ui/views/toolbar/toolbar_view.h" -#include "chrome/browser/ui/views/toolbar/wrench_toolbar_button.h" // static scoped_ptr @@ -26,7 +26,7 @@ MediaRouterActionPlatformDelegateViews:: } void MediaRouterActionPlatformDelegateViews::CloseOverflowMenuIfOpen() { - WrenchToolbarButton* app_menu_button = + AppMenuButton* app_menu_button = BrowserView::GetBrowserViewForBrowser(browser_) ->toolbar() ->app_menu_button(); diff --git a/chrome/browser/ui/views/toolbar/toolbar_action_view_interactive_uitest.cc b/chrome/browser/ui/views/toolbar/toolbar_action_view_interactive_uitest.cc index c91b0f10143a23..e072a0ac1b8c2a 100644 --- a/chrome/browser/ui/views/toolbar/toolbar_action_view_interactive_uitest.cc +++ b/chrome/browser/ui/views/toolbar/toolbar_action_view_interactive_uitest.cc @@ -9,11 +9,11 @@ #include "chrome/browser/ui/toolbar/toolbar_actions_bar.h" #include "chrome/browser/ui/views/frame/browser_view.h" #include "chrome/browser/ui/views/tabs/tab_drag_controller_interactive_uitest.h" +#include "chrome/browser/ui/views/toolbar/app_menu_button.h" #include "chrome/browser/ui/views/toolbar/browser_actions_container.h" #include "chrome/browser/ui/views/toolbar/extension_toolbar_menu_view.h" #include "chrome/browser/ui/views/toolbar/toolbar_view.h" #include "chrome/browser/ui/views/toolbar/wrench_menu.h" -#include "chrome/browser/ui/views/toolbar/wrench_toolbar_button.h" #include "chrome/test/base/interactive_test_utils.h" #include "extensions/common/feature_switch.h" #include "extensions/test/extension_test_message_listener.h" @@ -25,7 +25,7 @@ namespace { void TestOverflowedToolbarAction(Browser* browser, const base::Closure& quit_closure) { // A bunch of plumbing to safely get at the overflowed toolbar action. - WrenchToolbarButton* app_menu_button = + AppMenuButton* app_menu_button = BrowserView::GetBrowserViewForBrowser(browser) ->toolbar() ->app_menu_button(); @@ -106,7 +106,7 @@ IN_PROC_BROWSER_TEST_F(ToolbarActionViewInteractiveUITest, // opened. Listen for the message. ExtensionTestMessageListener listener("Popup opened", false); - WrenchToolbarButton* app_menu_button = + AppMenuButton* app_menu_button = BrowserView::GetBrowserViewForBrowser(browser()) ->toolbar() ->app_menu_button(); diff --git a/chrome/browser/ui/views/toolbar/toolbar_view.cc b/chrome/browser/ui/views/toolbar/toolbar_view.cc index 1d1c007d07dac9..c782307d913e46 100644 --- a/chrome/browser/ui/views/toolbar/toolbar_view.cc +++ b/chrome/browser/ui/views/toolbar/toolbar_view.cc @@ -36,12 +36,12 @@ #include "chrome/browser/ui/views/location_bar/star_view.h" #include "chrome/browser/ui/views/location_bar/translate_icon_view.h" #include "chrome/browser/ui/views/outdated_upgrade_bubble_view.h" +#include "chrome/browser/ui/views/toolbar/app_menu_button.h" #include "chrome/browser/ui/views/toolbar/back_button.h" #include "chrome/browser/ui/views/toolbar/browser_actions_container.h" #include "chrome/browser/ui/views/toolbar/home_button.h" #include "chrome/browser/ui/views/toolbar/reload_button.h" #include "chrome/browser/ui/views/toolbar/toolbar_button.h" -#include "chrome/browser/ui/views/toolbar/wrench_toolbar_button.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/pref_names.h" #include "chrome/grit/chromium_strings.h" @@ -210,7 +210,7 @@ void ToolbarView::Init() { browser_, NULL); // No master container for this one (it is master). - app_menu_button_ = new WrenchToolbarButton(this); + app_menu_button_ = new AppMenuButton(this); app_menu_button_->EnableCanvasFlippingForRTLUI(true); app_menu_button_->SetAccessibleName( l10n_util::GetStringUTF16(IDS_ACCNAME_APP)); diff --git a/chrome/browser/ui/views/toolbar/toolbar_view.h b/chrome/browser/ui/views/toolbar/toolbar_view.h index 29f9702e3ddddb..16d4fdc2b39877 100644 --- a/chrome/browser/ui/views/toolbar/toolbar_view.h +++ b/chrome/browser/ui/views/toolbar/toolbar_view.h @@ -18,13 +18,13 @@ #include "ui/views/controls/button/menu_button_listener.h" #include "ui/views/view.h" +class AppMenuButton; class BackButton; -class BrowserActionsContainer; class Browser; +class BrowserActionsContainer; class HomeButton; class ReloadButton; class ToolbarButton; -class WrenchToolbarButton; namespace extensions { class Command; @@ -89,7 +89,7 @@ class ToolbarView : public views::AccessiblePaneView, BrowserActionsContainer* browser_actions() const { return browser_actions_; } ReloadButton* reload_button() const { return reload_; } LocationBarView* location_bar() const { return location_bar_; } - WrenchToolbarButton* app_menu_button() const { return app_menu_button_; } + AppMenuButton* app_menu_button() const { return app_menu_button_; } HomeButton* home_button() const { return home_; } WrenchMenuBadgeController* app_menu_badge_controller() { return &badge_controller_; @@ -213,7 +213,7 @@ class ToolbarView : public views::AccessiblePaneView, HomeButton* home_; LocationBarView* location_bar_; BrowserActionsContainer* browser_actions_; - WrenchToolbarButton* app_menu_button_; + AppMenuButton* app_menu_button_; Browser* browser_; WrenchMenuBadgeController badge_controller_; diff --git a/chrome/browser/ui/views/toolbar/toolbar_view_interactive_uitest.cc b/chrome/browser/ui/views/toolbar/toolbar_view_interactive_uitest.cc index 991f38faa7759f..51999937f77e41 100644 --- a/chrome/browser/ui/views/toolbar/toolbar_view_interactive_uitest.cc +++ b/chrome/browser/ui/views/toolbar/toolbar_view_interactive_uitest.cc @@ -10,10 +10,10 @@ #include "chrome/browser/ui/views/frame/browser_view.h" #include "chrome/browser/ui/views/frame/test_with_browser_view.h" #include "chrome/browser/ui/views/tabs/tab_drag_controller_interactive_uitest.h" +#include "chrome/browser/ui/views/toolbar/app_menu_button.h" #include "chrome/browser/ui/views/toolbar/browser_actions_container.h" #include "chrome/browser/ui/views/toolbar/extension_toolbar_menu_view.h" #include "chrome/browser/ui/views/toolbar/toolbar_view.h" -#include "chrome/browser/ui/views/toolbar/wrench_toolbar_button.h" #include "chrome/test/base/interactive_test_utils.h" #include "extensions/common/feature_switch.h" @@ -132,7 +132,7 @@ void ToolbarViewInteractiveUITest::SetUpCommandLine( feature_override_.reset(new extensions::FeatureSwitch::ScopedOverride( extensions::FeatureSwitch::extension_action_redesign(), true)); ToolbarActionsBar::disable_animations_for_testing_ = true; - WrenchToolbarButton::g_open_app_immediately_for_testing = true; + AppMenuButton::g_open_app_immediately_for_testing = true; } void ToolbarViewInteractiveUITest::SetUpOnMainThread() { @@ -145,7 +145,7 @@ void ToolbarViewInteractiveUITest::SetUpOnMainThread() { void ToolbarViewInteractiveUITest::TearDownOnMainThread() { ToolbarActionsBar::disable_animations_for_testing_ = false; - WrenchToolbarButton::g_open_app_immediately_for_testing = false; + AppMenuButton::g_open_app_immediately_for_testing = false; } IN_PROC_BROWSER_TEST_F(ToolbarViewInteractiveUITest, diff --git a/chrome/chrome_browser_ui.gypi b/chrome/chrome_browser_ui.gypi index d26deb49a8bf74..594ed3ecef140a 100644 --- a/chrome/chrome_browser_ui.gypi +++ b/chrome/chrome_browser_ui.gypi @@ -2376,6 +2376,8 @@ 'browser/ui/views/task_manager_view.cc', 'browser/ui/views/theme_image_mapper.cc', 'browser/ui/views/theme_image_mapper.h', + 'browser/ui/views/toolbar/app_menu_button.cc', + 'browser/ui/views/toolbar/app_menu_button.h', 'browser/ui/views/toolbar/back_button.cc', 'browser/ui/views/toolbar/back_button.h', 'browser/ui/views/toolbar/browser_actions_container.cc', @@ -2399,8 +2401,6 @@ 'browser/ui/views/toolbar/wrench_menu.cc', 'browser/ui/views/toolbar/wrench_menu.h', 'browser/ui/views/toolbar/wrench_menu_observer.h', - 'browser/ui/views/toolbar/wrench_toolbar_button.cc', - 'browser/ui/views/toolbar/wrench_toolbar_button.h', 'browser/ui/views/touch_uma/touch_uma.h', 'browser/ui/views/translate/translate_bubble_view.cc', 'browser/ui/views/translate/translate_bubble_view.h',