chrome/browser/ui/cocoa/extensions/browser_action_button.mm - Issue 823133004: Cleanup: Update the path to gfx rect headers.

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

Issue 823133004: Cleanup: Update the path to gfx rect headers. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: rect_f.h Created 5 years, 11 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

« no previous file with comments | « chrome/browser/ui/cocoa/download/download_started_animation_mac.mm ('k') | chrome/browser/ui/cocoa/extensions/browser_action_test_util_mac.mm » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
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/strings/sys_string_conversions.h"	11 #include "base/strings/sys_string_conversions.h"

12 #include "chrome/browser/profiles/profile.h"	12 #include "chrome/browser/profiles/profile.h"

13 #include "chrome/browser/ui/browser.h"	13 #include "chrome/browser/ui/browser.h"

14 #include "chrome/browser/ui/browser_window.h"	14 #include "chrome/browser/ui/browser_window.h"

15 #import "chrome/browser/ui/cocoa/extensions/browser_actions_controller.h"	15 #import "chrome/browser/ui/cocoa/extensions/browser_actions_controller.h"

16 #import "chrome/browser/ui/cocoa/extensions/extension_action_context_menu_contro ller.h"	16 #import "chrome/browser/ui/cocoa/extensions/extension_action_context_menu_contro ller.h"

17 #import "chrome/browser/ui/cocoa/themed_window.h"	17 #import "chrome/browser/ui/cocoa/themed_window.h"

18 #import "chrome/browser/ui/cocoa/toolbar/toolbar_action_view_delegate_cocoa.h"	18 #import "chrome/browser/ui/cocoa/toolbar/toolbar_action_view_delegate_cocoa.h"

19 #include "chrome/browser/ui/toolbar/toolbar_action_view_controller.h"	19 #include "chrome/browser/ui/toolbar/toolbar_action_view_controller.h"

20 #include "grit/theme_resources.h"	20 #include "grit/theme_resources.h"

21 #include "skia/ext/skia_utils_mac.h"	21 #include "skia/ext/skia_utils_mac.h"

22 #import "third_party/google_toolbox_for_mac/src/AppKit/GTMNSAnimation+Duration.h "	22 #import "third_party/google_toolbox_for_mac/src/AppKit/GTMNSAnimation+Duration.h "

23 #include "ui/gfx/canvas_skia_paint.h"	23 #include "ui/gfx/canvas_skia_paint.h"

	24 #include "ui/gfx/geometry/rect.h"

24 #include "ui/gfx/image/image.h"	25 #include "ui/gfx/image/image.h"

25 #include "ui/gfx/rect.h"

26 #include "ui/gfx/scoped_ns_graphics_context_save_gstate_mac.h"	26 #include "ui/gfx/scoped_ns_graphics_context_save_gstate_mac.h"

27	27

28 NSString* const kBrowserActionButtonDraggingNotification =	28 NSString* const kBrowserActionButtonDraggingNotification =

29 @"BrowserActionButtonDraggingNotification";	29 @"BrowserActionButtonDraggingNotification";

30 NSString* const kBrowserActionButtonDragEndNotification =	30 NSString* const kBrowserActionButtonDragEndNotification =

31 @"BrowserActionButtonDragEndNotification";	31 @"BrowserActionButtonDragEndNotification";

32	32

33 static const CGFloat kBrowserActionBadgeOriginYOffset = 5;	33 static const CGFloat kBrowserActionBadgeOriginYOffset = 5;

34 static const CGFloat kAnimationDuration = 0.2;	34 static const CGFloat kAnimationDuration = 0.2;

35 static const CGFloat kMinimumDragDistance = 5;	35 static const CGFloat kMinimumDragDistance = 5;

(...skipping 376 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
412 - (ui::ThemeProvider)themeProviderForWindow:(NSWindow)window {	412 - (ui::ThemeProvider)themeProviderForWindow:(NSWindow)window {

413 ui::ThemeProvider* themeProvider = [window themeProvider];	413 ui::ThemeProvider* themeProvider = [window themeProvider];

414 if (!themeProvider)	414 if (!themeProvider)

415 themeProvider =	415 themeProvider =

416 [[browserActionsController_ browser]->window()->GetNativeWindow()	416 [[browserActionsController_ browser]->window()->GetNativeWindow()

417 themeProvider];	417 themeProvider];

418 return themeProvider;	418 return themeProvider;

419 }	419 }

420	420

421 @end	421 @end

OLD	NEW