chrome/browser/ui/cocoa/hover_close_button.mm - Issue 2276823003: Change many chrome/browser includes to use qualified paths.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: chrome/browser/ui/cocoa/hover_close_button.mm

Issue 2276823003: Change many chrome/browser includes to use qualified paths. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: rebase Created 4 years, 3 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

« chrome/browser/DEPS ('K') | « chrome/browser/ui/cocoa/find_bar/find_bar_cocoa_controller.mm ('k') | chrome/browser/ui/cocoa/infobars/before_translate_infobar_controller.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/hover_close_button.h"	5 #import "chrome/browser/ui/cocoa/hover_close_button.h"

6	6

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

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

9 #include "chrome/browser/themes/theme_properties.h"	9 #include "chrome/browser/themes/theme_properties.h"

10 #include "chrome/browser/themes/theme_service.h"	10 #include "chrome/browser/themes/theme_service.h"

11 #import "chrome/browser/ui/cocoa/browser_window_controller.h"	11 #import "chrome/browser/ui/cocoa/browser_window_controller.h"

12 #import "chrome/browser/ui/cocoa/tabs/tab_controller.h"	12 #import "chrome/browser/ui/cocoa/tabs/tab_controller.h"

13 #import "chrome/browser/ui/cocoa/tabs/tab_view.h"	13 #import "chrome/browser/ui/cocoa/tabs/tab_view.h"

14 #include "chrome/grit/generated_resources.h"	14 #include "chrome/grit/generated_resources.h"

15 #include "grit/components_strings.h"	15 #include "components/strings/grit/components_strings.h"

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

17 #import "third_party/google_toolbox_for_mac/src/AppKit/GTMKeyValueAnimation.h"	17 #import "third_party/google_toolbox_for_mac/src/AppKit/GTMKeyValueAnimation.h"

18 #include "ui/base/cocoa/animation_utils.h"	18 #include "ui/base/cocoa/animation_utils.h"

19 #include "ui/base/l10n/l10n_util.h"	19 #include "ui/base/l10n/l10n_util.h"

20 #include "ui/base/material_design/material_design_controller.h"	20 #include "ui/base/material_design/material_design_controller.h"

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

22 #include "ui/gfx/color_palette.h"	22 #include "ui/gfx/color_palette.h"

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

24 #include "ui/gfx/paint_vector_icon.h"	24 #include "ui/gfx/paint_vector_icon.h"

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

(...skipping 259 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
285 break;	285 break;

286 case kHoverStateMouseDown:	286 case kHoverStateMouseDown:

287 imageID = IDR_CLOSE_DIALOG_P;	287 imageID = IDR_CLOSE_DIALOG_P;

288 break;	288 break;

289 }	289 }

290 ui::ResourceBundle& bundle = ui::ResourceBundle::GetSharedInstance();	290 ui::ResourceBundle& bundle = ui::ResourceBundle::GetSharedInstance();

291 return bundle.GetNativeImageNamed(imageID).ToNSImage();	291 return bundle.GetNativeImageNamed(imageID).ToNSImage();

292 }	292 }

293	293

294 @end	294 @end

OLD	NEW