chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc - 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/ash/launcher/chrome_launcher_controller.cc

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/ash/launcher/browser_shortcut_launcher_item_controller.cc ('k') | chrome/browser/ui/ash/launcher/launcher_context_menu.cc » ('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/ash/launcher/chrome_launcher_controller.cc

diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc b/chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc

index 8ab60205af363c2bbb1a8ecb30e42c93c02c8bc7..a3690c2691e84f4730176281f61add080203ac4c 100644

--- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc

+++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc

@@ -65,6 +65,7 @@

#include "chrome/common/extensions/manifest_handlers/app_launch_info.h"

#include "chrome/common/pref_names.h"

#include "chrome/common/url_constants.h"

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

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

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

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

@@ -78,7 +79,6 @@

#include "extensions/common/manifest_handlers/icons_handler.h"

#include "extensions/common/url_pattern.h"

#include "grit/ash_resources.h"

-#include "grit/generated_resources.h"

#include "grit/theme_resources.h"

#include "net/base/url_util.h"

#include "ui/aura/window.h"