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

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/framed_browser_window.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:

Index: chrome/browser/ui/cocoa/framed_browser_window.mm

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

index e3e523914e88ae94e2ff4441e7e50762a3cab6fa..ee7ef6d96343fd919b62983394a017cfd5ff1a89 100644

--- a/chrome/browser/ui/cocoa/framed_browser_window.mm

+++ b/chrome/browser/ui/cocoa/framed_browser_window.mm

@@ -14,7 +14,6 @@

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

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

#include "grit/theme_resources.h"

-#include "grit/theme_resources_standard.h"

// Replicate specific 10.7 SDK declarations for building with prior SDKs.

#if !defined(MAC_OS_X_VERSION_10_7) || \