chrome/browser/ui/webui/options2/search_engine_manager_handler2.cc - Issue 9224002: Make WebUI objects not derive from WebUI. WebUI objects own the controller. This is the ownership...

Side by Side Diff: chrome/browser/ui/webui/options2/search_engine_manager_handler2.cc

Issue 9224002: Make WebUI objects not derive from WebUI. WebUI objects own the controller. This is the ownership... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

Patch Set: sync to head to clear linux_chromeos browsertest failures Created 8 years, 11 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 unified diff | Download patch | Annotate | Revision Log

« no previous file with comments | « chrome/browser/ui/webui/options2/password_manager_handler2.cc ('k') | chrome/browser/ui/webui/options2/startup_pages_handler2.cc » ('j') | content/browser/tab_contents/render_view_host_manager_unittest.cc » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 #include "chrome/browser/ui/webui/options2/search_engine_manager_handler2.h"	5 #include "chrome/browser/ui/webui/options2/search_engine_manager_handler2.h"

6	6

7 #include "base/bind.h"	7 #include "base/bind.h"

8 #include "base/string_number_conversions.h"	8 #include "base/string_number_conversions.h"

9 #include "base/utf_string_conversions.h"	9 #include "base/utf_string_conversions.h"

10 #include "base/values.h"	10 #include "base/values.h"

11 #include "chrome/browser/extensions/extension_service.h"	11 #include "chrome/browser/extensions/extension_service.h"

12 #include "chrome/browser/profiles/profile.h"	12 #include "chrome/browser/profiles/profile.h"

13 #include "chrome/browser/search_engines/template_url.h"	13 #include "chrome/browser/search_engines/template_url.h"

14 #include "chrome/browser/search_engines/template_url_service.h"	14 #include "chrome/browser/search_engines/template_url_service.h"

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

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

17 #include "chrome/common/extensions/extension.h"	17 #include "chrome/common/extensions/extension.h"

18 #include "chrome/common/url_constants.h"	18 #include "chrome/common/url_constants.h"

	19 #include "content/browser/webui/web_ui.h"

19 #include "grit/generated_resources.h"	20 #include "grit/generated_resources.h"

20 #include "grit/locale_settings.h"	21 #include "grit/locale_settings.h"

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

22	23

23 namespace {	24 namespace {

24	25

25 enum EngineInfoIndexes {	26 enum EngineInfoIndexes {

26 ENGINE_NAME,	27 ENGINE_NAME,

27 ENGINE_KEYWORD,	28 ENGINE_KEYWORD,

28 ENGINE_URL,	29 ENGINE_URL,

(...skipping 279 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
308 if (!args->GetString(ENGINE_NAME, &name) \|\|	309 if (!args->GetString(ENGINE_NAME, &name) \|\|

309 !args->GetString(ENGINE_KEYWORD, &keyword) \|\|	310 !args->GetString(ENGINE_KEYWORD, &keyword) \|\|

310 !args->GetString(ENGINE_URL, &url)) {	311 !args->GetString(ENGINE_URL, &url)) {

311 NOTREACHED();	312 NOTREACHED();

312 return;	313 return;

313 }	314 }

314 edit_controller_->AcceptAddOrEdit(name, keyword, url);	315 edit_controller_->AcceptAddOrEdit(name, keyword, url);

315 }	316 }

316	317

317 } // namespace options2	318 } // namespace options2

OLD	NEW