chrome/browser/ui/webui/options/search_engine_manager_handler.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/webui/options/search_engine_manager_handler.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/webui/options/reset_profile_settings_handler.cc ('k') | chrome/browser/ui/webui/options/startup_pages_handler.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/webui/options/search_engine_manager_handler.cc

diff --git a/chrome/browser/ui/webui/options/search_engine_manager_handler.cc b/chrome/browser/ui/webui/options/search_engine_manager_handler.cc

index 91fff4d65b9e5acbbecec8b124aab56b58276439..6671109156590974253227ef34574e9848a802a2 100644

--- a/chrome/browser/ui/webui/options/search_engine_manager_handler.cc

+++ b/chrome/browser/ui/webui/options/search_engine_manager_handler.cc

@@ -14,13 +14,13 @@

#include "chrome/browser/ui/search_engines/keyword_editor_controller.h"

#include "chrome/browser/ui/search_engines/template_url_table_model.h"

#include "chrome/common/url_constants.h"

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

#include "components/search_engines/template_url.h"

#include "components/search_engines/template_url_service.h"

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

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

#include "extensions/browser/extension_registry.h"

#include "extensions/common/extension.h"

-#include "grit/generated_resources.h"

#include "grit/locale_settings.h"

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

@@ -269,8 +269,7 @@ void SearchEngineManagerHandler::OnEditedKeyword(

}

void SearchEngineManagerHandler::CheckSearchEngineInfoValidity(

- const base::ListValue* args)

+ const base::ListValue* args) {

if (!edit_controller_.get())

return;

base::string16 name;