Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(297)

Side by Side Diff: chrome/browser/ui/cocoa/extensions/browser_action_button.mm

Issue 1770573002: Update extension buttons to Material Design (Mac). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@md_toolbar
Patch Set: Code clean-up. Created 4 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #import "chrome/browser/ui/cocoa/extensions/browser_action_button.h" 5 #import "chrome/browser/ui/cocoa/extensions/browser_action_button.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <cmath> 8 #include <cmath>
9 9
10 #include "base/logging.h" 10 #include "base/logging.h"
11 #include "base/mac/foundation_util.h"
11 #include "base/macros.h" 12 #include "base/macros.h"
12 #include "base/memory/weak_ptr.h" 13 #include "base/memory/weak_ptr.h"
13 #include "base/strings/sys_string_conversions.h" 14 #include "base/strings/sys_string_conversions.h"
14 #include "chrome/browser/profiles/profile.h" 15 #include "chrome/browser/profiles/profile.h"
15 #include "chrome/browser/ui/browser.h" 16 #include "chrome/browser/ui/browser.h"
16 #include "chrome/browser/ui/browser_window.h" 17 #include "chrome/browser/ui/browser_window.h"
17 #import "chrome/browser/ui/cocoa/app_menu/app_menu_controller.h" 18 #import "chrome/browser/ui/cocoa/app_menu/app_menu_controller.h"
18 #import "chrome/browser/ui/cocoa/browser_window_controller.h" 19 #import "chrome/browser/ui/cocoa/browser_window_controller.h"
19 #import "chrome/browser/ui/cocoa/extensions/browser_actions_controller.h" 20 #import "chrome/browser/ui/cocoa/extensions/browser_actions_controller.h"
20 #import "chrome/browser/ui/cocoa/themed_window.h" 21 #import "chrome/browser/ui/cocoa/themed_window.h"
21 #import "chrome/browser/ui/cocoa/toolbar/toolbar_controller.h" 22 #import "chrome/browser/ui/cocoa/toolbar/toolbar_controller.h"
22 #include "chrome/browser/ui/toolbar/toolbar_action_view_controller.h" 23 #include "chrome/browser/ui/toolbar/toolbar_action_view_controller.h"
23 #include "chrome/browser/ui/toolbar/toolbar_action_view_delegate.h" 24 #include "chrome/browser/ui/toolbar/toolbar_action_view_delegate.h"
24 #include "chrome/browser/ui/toolbar/toolbar_actions_bar.h" 25 #include "chrome/browser/ui/toolbar/toolbar_actions_bar.h"
25 #include "grit/theme_resources.h" 26 #include "grit/theme_resources.h"
26 #include "skia/ext/skia_utils_mac.h" 27 #include "skia/ext/skia_utils_mac.h"
27 #import "third_party/google_toolbox_for_mac/src/AppKit/GTMNSAnimation+Duration.h " 28 #import "third_party/google_toolbox_for_mac/src/AppKit/GTMNSAnimation+Duration.h "
28 #import "ui/base/cocoa/menu_controller.h" 29 #import "ui/base/cocoa/menu_controller.h"
30 #include "ui/base/material_design/material_design_controller.h"
29 #include "ui/gfx/canvas_skia_paint.h" 31 #include "ui/gfx/canvas_skia_paint.h"
30 #include "ui/gfx/geometry/rect.h" 32 #include "ui/gfx/geometry/rect.h"
31 #include "ui/gfx/image/image.h" 33 #include "ui/gfx/image/image.h"
32 #include "ui/gfx/scoped_ns_graphics_context_save_gstate_mac.h" 34 #include "ui/gfx/scoped_ns_graphics_context_save_gstate_mac.h"
33 35
34 NSString* const kBrowserActionButtonDraggingNotification = 36 NSString* const kBrowserActionButtonDraggingNotification =
35 @"BrowserActionButtonDraggingNotification"; 37 @"BrowserActionButtonDraggingNotification";
36 NSString* const kBrowserActionButtonDragEndNotification = 38 NSString* const kBrowserActionButtonDragEndNotification =
37 @"BrowserActionButtonDragEndNotification"; 39 @"BrowserActionButtonDragEndNotification";
38 40
(...skipping 155 matching lines...) Expand 10 before | Expand all | Expand 10 after
194 browserActionsController_ = controller; 196 browserActionsController_ = controller;
195 viewController_ = viewController; 197 viewController_ = viewController;
196 viewControllerDelegate_.reset( 198 viewControllerDelegate_.reset(
197 new ToolbarActionViewDelegateBridge(self, controller, viewController)); 199 new ToolbarActionViewDelegateBridge(self, controller, viewController));
198 200
199 [cell setBrowserActionsController:controller]; 201 [cell setBrowserActionsController:controller];
200 [cell 202 [cell
201 accessibilitySetOverrideValue:base::SysUTF16ToNSString( 203 accessibilitySetOverrideValue:base::SysUTF16ToNSString(
202 viewController_->GetAccessibleName([controller currentWebContents])) 204 viewController_->GetAccessibleName([controller currentWebContents]))
203 forAttribute:NSAccessibilityDescriptionAttribute]; 205 forAttribute:NSAccessibilityDescriptionAttribute];
204 [cell setImageID:IDR_BROWSER_ACTION 206 if (!ui::MaterialDesignController::IsModeMaterial()) {
205 forButtonState:image_button_cell::kDefaultState]; 207 [cell setImageID:IDR_BROWSER_ACTION
206 [cell setImageID:IDR_BROWSER_ACTION_H 208 forButtonState:image_button_cell::kDefaultState];
207 forButtonState:image_button_cell::kHoverState]; 209 [cell setImageID:IDR_BROWSER_ACTION_H
208 [cell setImageID:IDR_BROWSER_ACTION_P 210 forButtonState:image_button_cell::kHoverState];
209 forButtonState:image_button_cell::kPressedState]; 211 [cell setImageID:IDR_BROWSER_ACTION_P
210 [cell setImageID:IDR_BROWSER_ACTION 212 forButtonState:image_button_cell::kPressedState];
211 forButtonState:image_button_cell::kDisabledState]; 213 [cell setImageID:IDR_BROWSER_ACTION
212 214 forButtonState:image_button_cell::kDisabledState];
215 }
213 [self setTitle:@""]; 216 [self setTitle:@""];
214 [self setButtonType:NSMomentaryChangeButton]; 217 [self setButtonType:NSMomentaryChangeButton];
215 [self setShowsBorderOnlyWhileMouseInside:YES]; 218 [self setShowsBorderOnlyWhileMouseInside:YES];
216 219
217 moveAnimation_.reset([[NSViewAnimation alloc] init]); 220 moveAnimation_.reset([[NSViewAnimation alloc] init]);
218 [moveAnimation_ gtm_setDuration:kAnimationDuration 221 [moveAnimation_ gtm_setDuration:kAnimationDuration
219 eventMask:NSLeftMouseUpMask]; 222 eventMask:NSLeftMouseUpMask];
220 [moveAnimation_ setAnimationBlockingMode:NSAnimationNonblocking]; 223 [moveAnimation_ setAnimationBlockingMode:NSAnimationNonblocking];
221 224
222 [self updateState]; 225 [self updateState];
(...skipping 349 matching lines...) Expand 10 before | Expand all | Expand 10 after
572 - (const ui::ThemeProvider*)themeProviderForWindow:(NSWindow*)window { 575 - (const ui::ThemeProvider*)themeProviderForWindow:(NSWindow*)window {
573 const ui::ThemeProvider* themeProvider = [window themeProvider]; 576 const ui::ThemeProvider* themeProvider = [window themeProvider];
574 if (!themeProvider) 577 if (!themeProvider)
575 themeProvider = 578 themeProvider =
576 [[browserActionsController_ browser]->window()->GetNativeWindow() 579 [[browserActionsController_ browser]->window()->GetNativeWindow()
577 themeProvider]; 580 themeProvider];
578 return themeProvider; 581 return themeProvider;
579 } 582 }
580 583
581 @end 584 @end
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698