Skip to content

Commit

Permalink
chrome: Rename WrenchToolbarButton to AppMenuButton.
Browse files Browse the repository at this point in the history
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}
  • Loading branch information
tfarina authored and Commit bot committed Oct 21, 2015
1 parent c5045f9 commit 424c553
Show file tree
Hide file tree
Showing 24 changed files with 76 additions and 77 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down
2 changes: 1 addition & 1 deletion chrome/browser/ui/views/frame/browser_view.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion chrome/browser/ui/views/global_error_bubble_view.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
6 changes: 3 additions & 3 deletions chrome/browser/ui/views/keyboard_access_browsertest.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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),
Expand Down Expand Up @@ -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_;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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();
Expand All @@ -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);
}
Expand Down
2 changes: 1 addition & 1 deletion chrome/browser/ui/views/network_profile_bubble_view.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion chrome/browser/ui/views/session_crashed_bubble_view.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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_(
Expand All @@ -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();
Expand All @@ -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;

Expand Down Expand Up @@ -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();
Expand All @@ -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_) {
Expand All @@ -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);
Expand All @@ -190,40 +190,40 @@ 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);
image()->SetPaintToLayer(false);
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<ui::Clipboard::FormatType>* format_types) {
return allow_extension_dragging_ ?
BrowserActionDragData::GetDropFormats(format_types) :
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
Expand All @@ -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;
Expand Down
Loading

0 comments on commit 424c553

Please sign in to comment.