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/strings/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/extensions/extension_system.h" | |
13 #include "chrome/browser/profiles/profile.h" | 12 #include "chrome/browser/profiles/profile.h" |
14 #include "chrome/browser/search_engines/template_url.h" | 13 #include "chrome/browser/search_engines/template_url.h" |
15 #include "chrome/browser/search_engines/template_url_service.h" | 14 #include "chrome/browser/search_engines/template_url_service.h" |
16 #include "chrome/browser/ui/search_engines/keyword_editor_controller.h" | 15 #include "chrome/browser/ui/search_engines/keyword_editor_controller.h" |
17 #include "chrome/browser/ui/search_engines/template_url_table_model.h" | 16 #include "chrome/browser/ui/search_engines/template_url_table_model.h" |
18 #include "chrome/common/extensions/api/omnibox/omnibox_handler.h" | 17 #include "chrome/common/extensions/api/omnibox/omnibox_handler.h" |
19 #include "chrome/common/extensions/manifest_handlers/icons_handler.h" | 18 #include "chrome/common/extensions/manifest_handlers/icons_handler.h" |
20 #include "chrome/common/url_constants.h" | 19 #include "chrome/common/url_constants.h" |
21 #include "content/public/browser/web_ui.h" | 20 #include "content/public/browser/web_ui.h" |
| 21 #include "extensions/browser/extension_system.h" |
22 #include "extensions/common/extension.h" | 22 #include "extensions/common/extension.h" |
23 #include "grit/generated_resources.h" | 23 #include "grit/generated_resources.h" |
24 #include "grit/locale_settings.h" | 24 #include "grit/locale_settings.h" |
25 #include "ui/base/l10n/l10n_util.h" | 25 #include "ui/base/l10n/l10n_util.h" |
26 | 26 |
27 namespace { | 27 namespace { |
28 | 28 |
29 enum EngineInfoIndexes { | 29 enum EngineInfoIndexes { |
30 ENGINE_NAME, | 30 ENGINE_NAME, |
31 ENGINE_KEYWORD, | 31 ENGINE_KEYWORD, |
(...skipping 276 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
308 | 308 |
309 // Recheck validity. It's possible to get here with invalid input if e.g. the | 309 // Recheck validity. It's possible to get here with invalid input if e.g. the |
310 // user calls the right JS functions directly from the web inspector. | 310 // user calls the right JS functions directly from the web inspector. |
311 if (edit_controller_->IsTitleValid(name) && | 311 if (edit_controller_->IsTitleValid(name) && |
312 edit_controller_->IsKeywordValid(keyword) && | 312 edit_controller_->IsKeywordValid(keyword) && |
313 edit_controller_->IsURLValid(url)) | 313 edit_controller_->IsURLValid(url)) |
314 edit_controller_->AcceptAddOrEdit(name, keyword, url); | 314 edit_controller_->AcceptAddOrEdit(name, keyword, url); |
315 } | 315 } |
316 | 316 |
317 } // namespace options | 317 } // namespace options |
OLD | NEW |