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

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

Issue 2403853002: cocoa browser: remove remaining non-MD code (Closed)
Patch Set: git cl format Created 4 years, 2 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"
(...skipping 195 matching lines...) Expand 10 before | Expand all | Expand 10 after
206 browserActionsController_ = controller; 206 browserActionsController_ = controller;
207 viewController_ = viewController; 207 viewController_ = viewController;
208 viewControllerDelegate_.reset( 208 viewControllerDelegate_.reset(
209 new ToolbarActionViewDelegateBridge(self, controller, viewController)); 209 new ToolbarActionViewDelegateBridge(self, controller, viewController));
210 210
211 [cell setBrowserActionsController:controller]; 211 [cell setBrowserActionsController:controller];
212 [cell 212 [cell
213 accessibilitySetOverrideValue:base::SysUTF16ToNSString( 213 accessibilitySetOverrideValue:base::SysUTF16ToNSString(
214 viewController_->GetAccessibleName([controller currentWebContents])) 214 viewController_->GetAccessibleName([controller currentWebContents]))
215 forAttribute:NSAccessibilityDescriptionAttribute]; 215 forAttribute:NSAccessibilityDescriptionAttribute];
216 if (!ui::MaterialDesignController::IsModeMaterial()) {
217 [cell setImageID:IDR_BROWSER_ACTION
218 forButtonState:image_button_cell::kDefaultState];
219 [cell setImageID:IDR_BROWSER_ACTION_H
220 forButtonState:image_button_cell::kHoverState];
221 [cell setImageID:IDR_BROWSER_ACTION_P
222 forButtonState:image_button_cell::kPressedState];
223 [cell setImageID:IDR_BROWSER_ACTION
224 forButtonState:image_button_cell::kDisabledState];
225 }
226 [self setTitle:@""]; 216 [self setTitle:@""];
227 [self setButtonType:NSMomentaryChangeButton]; 217 [self setButtonType:NSMomentaryChangeButton];
228 [self setShowsBorderOnlyWhileMouseInside:YES]; 218 [self setShowsBorderOnlyWhileMouseInside:YES];
229 219
230 moveAnimation_.reset([[NSViewAnimation alloc] init]); 220 moveAnimation_.reset([[NSViewAnimation alloc] init]);
231 [moveAnimation_ gtm_setDuration:kAnimationDuration 221 [moveAnimation_ gtm_setDuration:kAnimationDuration
232 eventMask:NSLeftMouseUpMask]; 222 eventMask:NSLeftMouseUpMask];
233 [moveAnimation_ setAnimationBlockingMode:NSAnimationNonblocking]; 223 [moveAnimation_ setAnimationBlockingMode:NSAnimationNonblocking];
234 224
235 [self updateState]; 225 [self updateState];
(...skipping 343 matching lines...) Expand 10 before | Expand all | Expand 10 after
579 - (const ui::ThemeProvider*)themeProviderForWindow:(NSWindow*)window { 569 - (const ui::ThemeProvider*)themeProviderForWindow:(NSWindow*)window {
580 const ui::ThemeProvider* themeProvider = [window themeProvider]; 570 const ui::ThemeProvider* themeProvider = [window themeProvider];
581 if (!themeProvider) 571 if (!themeProvider)
582 themeProvider = 572 themeProvider =
583 [[browserActionsController_ browser]->window()->GetNativeWindow() 573 [[browserActionsController_ browser]->window()->GetNativeWindow()
584 themeProvider]; 574 themeProvider];
585 return themeProvider; 575 return themeProvider;
586 } 576 }
587 577
588 @end 578 @end
OLDNEW
« no previous file with comments | « chrome/browser/ui/cocoa/browser_window_utils.mm ('k') | chrome/browser/ui/cocoa/framed_browser_window.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698