chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm - Issue 480693002: Use a qualified path for ui_resources.h grit includes.

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 480693002: Use a qualified path for ui_resources.h grit includes. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: REBASE 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:

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 e8a76a1299733fc4f04e4adcfbd4b8749758f251..45e3a13342f6a005015cacef69e1bb46b97286c8 100644

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

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

@@ -58,7 +58,6 @@

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

#include "grit/generated_resources.h"

#include "grit/theme_resources.h"

-#include "grit/ui_resources.h"

#include "skia/ext/skia_utils_mac.h"

#import "third_party/google_toolbox_for_mac/src/AppKit/GTMNSAnimation+Duration.h"

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

@@ -69,6 +68,7 @@

#include "ui/base/theme_provider.h"

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

#include "ui/gfx/mac/scoped_ns_disable_screen_updates.h"

+#include "ui/resources/grit/ui_resources.h"

using base::UserMetricsAction;

using content::OpenURLParams;