chrome/browser/ui/app_list/search/search_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/app_list/search/search_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: 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:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/ui/app_list/search/people/people_result.cc ('k') | chrome/browser/ui/app_list/search/search_webstore_result.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/app_list/search/search_controller.cc

diff --git a/chrome/browser/ui/app_list/search/search_controller.cc b/chrome/browser/ui/app_list/search/search_controller.cc

index c7df8dbf34dffce4582bffcd3189fb414653aa4e..f53ed2899b9545d07cf8b25e2f96aa9ae0e08d88 100644

--- a/chrome/browser/ui/app_list/search/search_controller.cc

+++ b/chrome/browser/ui/app_list/search/search_controller.cc

@@ -24,9 +24,9 @@

#include "chrome/browser/ui/app_list/search/webstore/webstore_provider.h"

#include "chrome/browser/ui/app_list/start_page_service.h"

#include "chrome/common/chrome_switches.h"

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

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

#include "grit/component_scaled_resources.h"

-#include "grit/generated_resources.h"

#include "grit/theme_resources.h"

#include "ui/app_list/search_box_model.h"

#include "ui/app_list/speech_ui_model.h"