chrome/browser/ui/webui/options/search_engine_manager_handler.cc - Issue 15949029: Use a direct include of utf_string_conversions.h in chrome/browser/ui/, part 2.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

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

Side by Side Diff: chrome/browser/ui/webui/options/search_engine_manager_handler.cc

Issue 15949029: Use a direct include of utf_string_conversions.h in chrome/browser/ui/, part 2. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase Created 7 years, 6 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/options/password_manager_handler.cc ('k') | chrome/browser/ui/webui/performance_monitor/performance_monitor_ui.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2012 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/options/search_engine_manager_handler.h"	5 #include "chrome/browser/ui/webui/options/search_engine_manager_handler.h"

6	6

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

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

9 #include "base/utf_string_conversions.h"	9 #include "base/strings/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/api/omnibox/omnibox_handler.h"	17 #include "chrome/common/extensions/api/omnibox/omnibox_handler.h"

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

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

(...skipping 277 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
297	297

298 // Recheck validity. It's possible to get here with invalid input if e.g. the	298 // Recheck validity. It's possible to get here with invalid input if e.g. the

299 // user calls the right JS functions directly from the web inspector.	299 // user calls the right JS functions directly from the web inspector.

300 if (edit_controller_->IsTitleValid(name) &&	300 if (edit_controller_->IsTitleValid(name) &&

301 edit_controller_->IsKeywordValid(keyword) &&	301 edit_controller_->IsKeywordValid(keyword) &&

302 edit_controller_->IsURLValid(url))	302 edit_controller_->IsURLValid(url))

303 edit_controller_->AcceptAddOrEdit(name, keyword, url);	303 edit_controller_->AcceptAddOrEdit(name, keyword, url);

304 }	304 }

305	305

306 } // namespace options	306 } // namespace options

OLD	NEW