chrome/browser/ui/cocoa/hover_close_button.mm - Issue 17593006: mac: Update clients of scoped_nsobject.h.

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 17593006: mac: Update clients of scoped_nsobject.h. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: cleanups Created 7 years, 6 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 | Annotate | Revision Log

« chrome/browser/ui/cocoa/bookmarks/bookmark_bar_bridge_unittest.mm ('K') | « chrome/browser/ui/cocoa/history_overlay_controller_unittest.mm ('k') | chrome/browser/ui/cocoa/hover_close_button_unittest.mm » ('j') | chrome/common/mac/objc_method_swizzle.mm » ('J')
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/memory/scoped_nsobject.h"	7 #include "base/mac/scoped_nsobject.h"

8 #include "base/memory/scoped_ptr.h"	8 #include "base/memory/scoped_ptr.h"

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

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

11 #include "grit/ui_resources.h"	11 #include "grit/ui_resources.h"

12 #import "third_party/GTM/AppKit/GTMKeyValueAnimation.h"	12 #import "third_party/GTM/AppKit/GTMKeyValueAnimation.h"

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

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

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

16	16

17 namespace {	17 namespace {

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

231 case kHoverStateMouseDown:	231 case kHoverStateMouseDown:

232 imageID = IDR_CLOSE_DIALOG_P;	232 imageID = IDR_CLOSE_DIALOG_P;

233 break;	233 break;

234 }	234 }

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

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

237 }	237 }

238	238

239 @end	239 @end

OLD	NEW