chrome/browser/ui/panels/panel_titlebar_view_cocoa.mm - Issue 10756018: Merge grd files in ui/resources and chrome/app/theme

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/panels/panel_titlebar_view_cocoa.mm

Issue 10756018: Merge grd files in ui/resources and chrome/app/theme (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase, *_standard.rc Created 8 years, 5 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

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/panels/panel_titlebar_view_cocoa.h"	5 #import "chrome/browser/ui/panels/panel_titlebar_view_cocoa.h"

6	6

7 #include <Carbon/Carbon.h> // kVK_Escape	7 #include <Carbon/Carbon.h> // kVK_Escape

8 #import <Cocoa/Cocoa.h>	8 #import <Cocoa/Cocoa.h>

9	9

10 #include "base/logging.h"	10 #include "base/logging.h"

11 #include "base/mac/scoped_nsautorelease_pool.h"	11 #include "base/mac/scoped_nsautorelease_pool.h"

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

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

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

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

16 #import "chrome/browser/ui/cocoa/tracking_area.h"	16 #import "chrome/browser/ui/cocoa/tracking_area.h"

17 #import "chrome/browser/ui/panels/panel_constants.h"	17 #import "chrome/browser/ui/panels/panel_constants.h"

18 #import "chrome/browser/ui/panels/panel_window_controller_cocoa.h"	18 #import "chrome/browser/ui/panels/panel_window_controller_cocoa.h"

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

20 #include "grit/theme_resources_standard.h"

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

22 #import "third_party/GTM/AppKit/GTMNSBezierPath+RoundRect.h"	21 #import "third_party/GTM/AppKit/GTMNSBezierPath+RoundRect.h"

23 #import "third_party/GTM/AppKit/GTMNSColor+Luminance.h"	22 #import "third_party/GTM/AppKit/GTMNSColor+Luminance.h"

24 #include "ui/base/l10n/l10n_util_mac.h"	23 #include "ui/base/l10n/l10n_util_mac.h"

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

26 #include "ui/gfx/mac/nsimage_cache.h"	25 #include "ui/gfx/mac/nsimage_cache.h"

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

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

29	28

30 const int kButtonPadding = 8;	29 const int kButtonPadding = 8;

(...skipping 652 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
683 - (NSButton*)minimizeButton {	682 - (NSButton*)minimizeButton {

684 return minimizeButton_;	683 return minimizeButton_;

685 }	684 }

686	685

687 - (NSButton*)restoreButton {	686 - (NSButton*)restoreButton {

688 return restoreButton_;	687 return restoreButton_;

689 }	688 }

690	689

691 @end	690 @end

692	691

OLD	NEW

« no previous file with comments | « chrome/browser/ui/panels/panel_browser_window_gtk.cc ('k') | chrome/browser/ui/panels/panel_window_controller_cocoa.mm » ('j') | no next file with comments »