chrome/browser/ui/cocoa/panels/panel_titlebar_view_cocoa.mm - Issue 498773003: Use a qualified path for chromium_strings, google_chrome_strings, and generated_resources. (part 2 …

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

Unified Diff: chrome/browser/ui/cocoa/panels/panel_titlebar_view_cocoa.mm

Issue 498773003: Use a qualified path for chromium_strings, google_chrome_strings, and generated_resources. (part 2 … (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: nit Created 6 years, 4 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 side-by-side diff with in-line comments

Download patch

« chrome/browser/ui/android/content_settings/popup_blocked_infobar_delegate.cc ('K') | « chrome/browser/ui/cocoa/one_click_signin_view_controller.mm ('k') | chrome/browser/ui/cocoa/passwords/manage_passwords_bubble_pending_view_controller.mm » ('j') | chrome/browser/ui/views/extensions/extension_installed_bubble_view.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/cocoa/panels/panel_titlebar_view_cocoa.mm

diff --git a/chrome/browser/ui/cocoa/panels/panel_titlebar_view_cocoa.mm b/chrome/browser/ui/cocoa/panels/panel_titlebar_view_cocoa.mm

index 1888daded8ab3c2b325f8397e89ffde3718982db..beca1ffd0346ba2a6d013b4c65cdce07e95b3c05 100644

--- a/chrome/browser/ui/cocoa/panels/panel_titlebar_view_cocoa.mm

+++ b/chrome/browser/ui/cocoa/panels/panel_titlebar_view_cocoa.mm

@@ -11,15 +11,15 @@

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

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

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

-#include "grit/generated_resources.h"

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

#include "grit/theme_resources.h"

#import "third_party/google_toolbox_for_mac/src/AppKit/GTMNSBezierPath+RoundRect.h"

#import "third_party/google_toolbox_for_mac/src/AppKit/GTMNSColor+Luminance.h"

-#include "ui/base/l10n/l10n_util_mac.h"

#import "ui/base/cocoa/hover_image_button.h"

+#include "ui/base/l10n/l10n_util_mac.h"

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

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

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

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

// 'Glint' is a glowing light animation on the titlebar to attract user's

// attention. Numbers are arbitrary, based on several tries.