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

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

Issue 1133713009: Subject .mm files to the header sorting presubmit (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase - of course... it would be one of my patches I conflict with :| Created 5 years, 7 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/memory/weak_ptr.h" 11 #include "base/memory/weak_ptr.h"
12 #include "base/strings/sys_string_conversions.h" 12 #include "base/strings/sys_string_conversions.h"
13 #include "chrome/browser/profiles/profile.h" 13 #include "chrome/browser/profiles/profile.h"
14 #include "chrome/browser/ui/browser.h" 14 #include "chrome/browser/ui/browser.h"
15 #include "chrome/browser/ui/browser_window.h" 15 #include "chrome/browser/ui/browser_window.h"
16 #include "chrome/browser/ui/toolbar/toolbar_actions_bar.h"
17 #import "chrome/browser/ui/cocoa/browser_window_controller.h" 16 #import "chrome/browser/ui/cocoa/browser_window_controller.h"
18 #import "chrome/browser/ui/cocoa/extensions/browser_actions_controller.h" 17 #import "chrome/browser/ui/cocoa/extensions/browser_actions_controller.h"
19 #import "chrome/browser/ui/cocoa/themed_window.h" 18 #import "chrome/browser/ui/cocoa/themed_window.h"
20 #import "chrome/browser/ui/cocoa/toolbar/toolbar_controller.h" 19 #import "chrome/browser/ui/cocoa/toolbar/toolbar_controller.h"
21 #import "chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller.h" 20 #import "chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller.h"
22 #include "chrome/browser/ui/toolbar/toolbar_action_view_controller.h" 21 #include "chrome/browser/ui/toolbar/toolbar_action_view_controller.h"
23 #include "chrome/browser/ui/toolbar/toolbar_action_view_delegate.h" 22 #include "chrome/browser/ui/toolbar/toolbar_action_view_delegate.h"
23 #include "chrome/browser/ui/toolbar/toolbar_actions_bar.h"
24 #include "grit/theme_resources.h" 24 #include "grit/theme_resources.h"
25 #include "skia/ext/skia_utils_mac.h" 25 #include "skia/ext/skia_utils_mac.h"
26 #import "third_party/google_toolbox_for_mac/src/AppKit/GTMNSAnimation+Duration.h " 26 #import "third_party/google_toolbox_for_mac/src/AppKit/GTMNSAnimation+Duration.h "
27 #import "ui/base/cocoa/menu_controller.h" 27 #import "ui/base/cocoa/menu_controller.h"
28 #include "ui/gfx/canvas_skia_paint.h" 28 #include "ui/gfx/canvas_skia_paint.h"
29 #include "ui/gfx/geometry/rect.h" 29 #include "ui/gfx/geometry/rect.h"
30 #include "ui/gfx/image/image.h" 30 #include "ui/gfx/image/image.h"
31 #include "ui/gfx/scoped_ns_graphics_context_save_gstate_mac.h" 31 #include "ui/gfx/scoped_ns_graphics_context_save_gstate_mac.h"
32 32
33 NSString* const kBrowserActionButtonDraggingNotification = 33 NSString* const kBrowserActionButtonDraggingNotification =
(...skipping 530 matching lines...) Expand 10 before | Expand all | Expand 10 after
564 - (ui::ThemeProvider*)themeProviderForWindow:(NSWindow*)window { 564 - (ui::ThemeProvider*)themeProviderForWindow:(NSWindow*)window {
565 ui::ThemeProvider* themeProvider = [window themeProvider]; 565 ui::ThemeProvider* themeProvider = [window themeProvider];
566 if (!themeProvider) 566 if (!themeProvider)
567 themeProvider = 567 themeProvider =
568 [[browserActionsController_ browser]->window()->GetNativeWindow() 568 [[browserActionsController_ browser]->window()->GetNativeWindow()
569 themeProvider]; 569 themeProvider];
570 return themeProvider; 570 return themeProvider;
571 } 571 }
572 572
573 @end 573 @end
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698