Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(36)

Side by Side Diff: chrome/browser/ui/webui/edit_search_engine_dialog_webui.cc

Issue 8676008: Add automated test for the edit search engine dialog. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: File renames, address nits and add documentation. Created 9 years 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
OLDNEW
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/edit_search_engine_dialog_webui.h" 5 #include "chrome/browser/ui/webui/edit_search_engine_dialog_webui.h"
6 6
7 #include <string> 7 #include <string>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/bind.h" 10 #include "base/bind.h"
11 #include "base/bind_helpers.h" 11 #include "base/bind_helpers.h"
12 #include "base/json/json_reader.h" 12 #include "base/json/json_reader.h"
13 #include "base/string16.h" 13 #include "base/string16.h"
14 #include "chrome/browser/profiles/profile.h" 14 #include "chrome/browser/profiles/profile.h"
15 #include "chrome/browser/search_engines/template_url.h" 15 #include "chrome/browser/search_engines/template_url.h"
16 #include "chrome/browser/ui/browser.h" 16 #include "chrome/browser/ui/browser.h"
17 #include "chrome/browser/ui/browser_list.h" 17 #include "chrome/browser/ui/browser_list.h"
18 #include "chrome/browser/ui/search_engines/edit_search_engine_controller.h" 18 #include "chrome/browser/ui/search_engines/edit_search_engine_controller.h"
19 #include "chrome/browser/ui/webui/theme_source.h" 19 #include "chrome/browser/ui/webui/theme_source.h"
20 #include "chrome/common/url_constants.h" 20 #include "chrome/common/url_constants.h"
21 #include "grit/generated_resources.h"
22 #include "grit/theme_resources.h"
21 #include "grit/ui_resources.h" 23 #include "grit/ui_resources.h"
22 #include "grit/theme_resources.h"
23 #include "grit/generated_resources.h"
24 #include "ui/base/l10n/l10n_util.h" 24 #include "ui/base/l10n/l10n_util.h"
25 25
26 namespace { 26 namespace {
27 const int kEditSearchEngineDialogWidth = 394; 27 const int kEditSearchEngineDialogWidth = 394;
28 const int kEditSearchEngineDialogHeight = 180; 28 const int kEditSearchEngineDialogHeight = 180;
29 } 29 }
30 30
31 //////////////////////////////////////////////////////////////////////////////// 31 ////////////////////////////////////////////////////////////////////////////////
32 // Browser dialog API implementation 32 // Browser dialog API implementation
33 33
(...skipping 113 matching lines...) Expand 10 before | Expand all | Expand 10 after
147 string16 description_str; 147 string16 description_str;
148 string16 keyword_str; 148 string16 keyword_str;
149 std::string url_str; 149 std::string url_str;
150 if (args && args->GetString(0, &description_str) && 150 if (args && args->GetString(0, &description_str) &&
151 args->GetString(1, &keyword_str) && 151 args->GetString(1, &keyword_str) &&
152 args->GetString(2, &url_str)) { 152 args->GetString(2, &url_str)) {
153 DictionaryValue validation; 153 DictionaryValue validation;
154 bool isDescriptionValid = controller_->IsTitleValid(description_str); 154 bool isDescriptionValid = controller_->IsTitleValid(description_str);
155 bool isKeywordValid = controller_->IsKeywordValid(keyword_str); 155 bool isKeywordValid = controller_->IsKeywordValid(keyword_str);
156 bool isUrlValid = controller_->IsURLValid(url_str); 156 bool isUrlValid = controller_->IsURLValid(url_str);
157 validation.SetBoolean("description", isDescriptionValid ); 157 validation.SetBoolean("description", isDescriptionValid);
158 validation.SetBoolean("keyword", isKeywordValid ); 158 validation.SetBoolean("keyword", isKeywordValid);
159 validation.SetBoolean("url", isUrlValid ); 159 validation.SetBoolean("url", isUrlValid);
160 validation.SetBoolean("ok", isDescriptionValid && isKeywordValid && 160 validation.SetBoolean("ok", isDescriptionValid && isKeywordValid &&
161 isUrlValid ); 161 isUrlValid);
162 web_ui_->CallJavascriptFunction("editSearchEngineDialog.setValidation", 162 web_ui_->CallJavascriptFunction("editSearchEngineDialog.setValidation",
163 validation); 163 validation);
164 } 164 }
165 } 165 }
166 166
167 // Returns true if adding. Returns false if editing. 167 // Returns true if adding. Returns false if editing.
168 bool EditSearchEngineDialogHandlerWebUI::IsAdding() { 168 bool EditSearchEngineDialogHandlerWebUI::IsAdding() {
169 return !template_url_; 169 return !template_url_;
170 } 170 }
171 171
(...skipping 11 matching lines...) Expand all
183 dict->GetString("keyword", &keyword_str) && 183 dict->GetString("keyword", &keyword_str) &&
184 dict->GetString("url", &url_str)) { 184 dict->GetString("url", &url_str)) {
185 controller_->AcceptAddOrEdit(description_str, 185 controller_->AcceptAddOrEdit(description_str,
186 keyword_str, 186 keyword_str,
187 url_str); 187 url_str);
188 } else { 188 } else {
189 controller_->CleanUpCancelledAdd(); 189 controller_->CleanUpCancelledAdd();
190 } 190 }
191 } 191 }
192 } 192 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698