chrome/browser/ui/cocoa/location_bar/action_box_menu_bubble_controller.mm - Issue 13460012: Move IconsHandler from c/c/e/api/ to c/c/e

Side by Side Diff: chrome/browser/ui/cocoa/location_bar/action_box_menu_bubble_controller.mm

Issue 13460012: Move IconsHandler from c/c/e/api/ to c/c/e (Closed) Base URL: http://git.chromium.org/chromium/src.git@master

Patch Set: Latest master for CQ Created 7 years, 8 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/infobars/extension_infobar_controller.mm ('k') | chrome/browser/ui/cocoa/location_bar/page_action_decoration.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/location_bar/action_box_menu_bubble_controller. h"	5 #import "chrome/browser/ui/cocoa/location_bar/action_box_menu_bubble_controller. h"

6	6

7 #include "base/mac/bundle_locations.h"	7 #include "base/mac/bundle_locations.h"

8 #include "base/mac/foundation_util.h"	8 #include "base/mac/foundation_util.h"

9 #include "base/mac/mac_util.h"	9 #include "base/mac/mac_util.h"

10 #include "base/strings/sys_string_conversions.h"	10 #include "base/strings/sys_string_conversions.h"

11 #include "chrome/browser/extensions/extension_icon_image.h"	11 #include "chrome/browser/extensions/extension_icon_image.h"

12 #import "chrome/browser/ui/cocoa/browser_window_utils.h"	12 #import "chrome/browser/ui/cocoa/browser_window_utils.h"

13 #import "chrome/browser/ui/cocoa/event_utils.h"	13 #import "chrome/browser/ui/cocoa/event_utils.h"

14 #import "chrome/browser/ui/cocoa/info_bubble_view.h"	14 #import "chrome/browser/ui/cocoa/info_bubble_view.h"

15 #import "chrome/browser/ui/cocoa/info_bubble_window.h"	15 #import "chrome/browser/ui/cocoa/info_bubble_window.h"

16 #include "chrome/browser/ui/toolbar/action_box_menu_model.h"	16 #include "chrome/browser/ui/toolbar/action_box_menu_model.h"

17 #include "chrome/common/extensions/api/extension_action/action_info.h"	17 #include "chrome/common/extensions/api/extension_action/action_info.h"

18 #include "chrome/common/extensions/api/icons/icons_handler.h"

19 #include "chrome/common/extensions/extension.h"	18 #include "chrome/common/extensions/extension.h"

20 #include "chrome/common/extensions/extension_constants.h"	19 #include "chrome/common/extensions/extension_constants.h"

	20 #include "chrome/common/extensions/manifest_handlers/icons_handler.h"

21 #include "grit/generated_resources.h"	21 #include "grit/generated_resources.h"

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

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

24 #import "third_party/GTM/AppKit/GTMUILocalizerAndLayoutTweaker.h"	24 #import "third_party/GTM/AppKit/GTMUILocalizerAndLayoutTweaker.h"

25 #include "ui/base/resource/resource_bundle.h"	25 #include "ui/base/resource/resource_bundle.h"

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

27 #include "ui/gfx/image/image_skia_util_mac.h"	27 #include "ui/gfx/image/image_skia_util_mac.h"

28 #include "ui/native_theme/native_theme.h"	28 #include "ui/native_theme/native_theme.h"

29	29

30 @interface ActionBoxMenuBubbleController (Private)	30 @interface ActionBoxMenuBubbleController (Private)

(...skipping 434 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
465 [super accessibilityPerformAction:action];	465 [super accessibilityPerformAction:action];

466 }	466 }

467	467

468 - (NSColor*)highlightedMenuItemBackgroundColor {	468 - (NSColor*)highlightedMenuItemBackgroundColor {

469 ui::NativeTheme* nativeTheme = ui::NativeTheme::instance();	469 ui::NativeTheme* nativeTheme = ui::NativeTheme::instance();

470 return gfx::SkColorToCalibratedNSColor(nativeTheme->GetSystemColor(	470 return gfx::SkColorToCalibratedNSColor(nativeTheme->GetSystemColor(

471 ui::NativeTheme::kColorId_FocusedMenuItemBackgroundColor));	471 ui::NativeTheme::kColorId_FocusedMenuItemBackgroundColor));

472 }	472 }

473	473

474 @end	474 @end

OLD	NEW