chrome/browser/ui/cocoa/tabs/tab_strip_controller.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/tabs/tab_strip_controller.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/tab_contents/sad_tab_view.mm ('k') | chrome/browser/ui/cocoa/tabs/tab_strip_view.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/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 45e3a13342f6a005015cacef69e1bb46b97286c8..6c8c273493d8c55e6f4170ebde2a677fc98f1c8f 100644

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

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

@@ -49,6 +49,7 @@

#include "chrome/browser/ui/tabs/tab_utils.h"

#include "chrome/common/chrome_switches.h"

#include "chrome/common/pref_names.h"

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

#include "components/metrics/proto/omnibox_event.pb.h"

#include "components/omnibox/autocomplete_match.h"

#include "components/url_fixer/url_fixer.h"

@@ -56,7 +57,6 @@

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

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

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

-#include "grit/generated_resources.h"

#include "grit/theme_resources.h"

#include "skia/ext/skia_utils_mac.h"

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