chrome/browser/ui/cocoa/tabs/tab_strip_controller.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/tabs/tab_strip_controller.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: merge 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/tabs/tab_strip_controller.mm

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

index 12bd9e9e3de01c11bfba80ff7fd7a8909178c5b3..7acbd171241e505c5bde862a1e72730bf92fad03 100644

--- a/chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm

+++ b/chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm

@@ -59,9 +59,7 @@

#include "content/public/browser/web_contents_view.h"

#include "grit/generated_resources.h"

#include "grit/theme_resources.h"

-#include "grit/theme_resources_standard.h"

#include "grit/ui_resources.h"

-#include "grit/ui_resources_standard.h"

#include "skia/ext/skia_utils_mac.h"

#import "third_party/GTM/AppKit/GTMNSAnimation+Duration.h"

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