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

Side by Side Diff: chrome/browser/ui/webui/settings/settings_startup_pages_handler.cc

Issue 2476493003: Remove FundamentalValue
Patch Set: Fix Created 4 years, 1 month 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
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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/settings/settings_startup_pages_handler.h" 5 #include "chrome/browser/ui/webui/settings/settings_startup_pages_handler.h"
6 6
7 #include <memory> 7 #include <memory>
8 #include <string> 8 #include <string>
9 #include <utility> 9 #include <utility>
10 #include <vector> 10 #include <vector>
(...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after
106 CHECK_EQ(2U, args->GetSize()); 106 CHECK_EQ(2U, args->GetSize());
107 107
108 const base::Value* callback_id; 108 const base::Value* callback_id;
109 CHECK(args->Get(0, &callback_id)); 109 CHECK(args->Get(0, &callback_id));
110 110
111 std::string url_string; 111 std::string url_string;
112 CHECK(args->GetString(1, &url_string)); 112 CHECK(args->GetString(1, &url_string));
113 113
114 GURL url; 114 GURL url;
115 if (!settings_utils::FixupAndValidateStartupPage(url_string, &url)) { 115 if (!settings_utils::FixupAndValidateStartupPage(url_string, &url)) {
116 ResolveJavascriptCallback(*callback_id, base::FundamentalValue(false)); 116 ResolveJavascriptCallback(*callback_id, base::Value(false));
117 return; 117 return;
118 } 118 }
119 119
120 int row_count = startup_custom_pages_table_model_.RowCount(); 120 int row_count = startup_custom_pages_table_model_.RowCount();
121 int index; 121 int index;
122 if (!args->GetInteger(1, &index) || index > row_count) 122 if (!args->GetInteger(1, &index) || index > row_count)
123 index = row_count; 123 index = row_count;
124 124
125 startup_custom_pages_table_model_.Add(index, url); 125 startup_custom_pages_table_model_.Add(index, url);
126 SaveStartupPagesPref(); 126 SaveStartupPagesPref();
127 ResolveJavascriptCallback(*callback_id, base::FundamentalValue(true)); 127 ResolveJavascriptCallback(*callback_id, base::Value(true));
128 } 128 }
129 129
130 void StartupPagesHandler::HandleEditStartupPage(const base::ListValue* args) { 130 void StartupPagesHandler::HandleEditStartupPage(const base::ListValue* args) {
131 CHECK_EQ(args->GetSize(), 3U); 131 CHECK_EQ(args->GetSize(), 3U);
132 const base::Value* callback_id; 132 const base::Value* callback_id;
133 CHECK(args->Get(0, &callback_id)); 133 CHECK(args->Get(0, &callback_id));
134 int index; 134 int index;
135 CHECK(args->GetInteger(1, &index)); 135 CHECK(args->GetInteger(1, &index));
136 136
137 if (index < 0 || index > startup_custom_pages_table_model_.RowCount()) { 137 if (index < 0 || index > startup_custom_pages_table_model_.RowCount()) {
138 RejectJavascriptCallback(*callback_id, *base::Value::CreateNullValue()); 138 RejectJavascriptCallback(*callback_id, *base::Value::CreateNullValue());
139 NOTREACHED(); 139 NOTREACHED();
140 return; 140 return;
141 } 141 }
142 142
143 std::string url_string; 143 std::string url_string;
144 CHECK(args->GetString(2, &url_string)); 144 CHECK(args->GetString(2, &url_string));
145 145
146 GURL fixed_url; 146 GURL fixed_url;
147 if (settings_utils::FixupAndValidateStartupPage(url_string, &fixed_url)) { 147 if (settings_utils::FixupAndValidateStartupPage(url_string, &fixed_url)) {
148 std::vector<GURL> urls = startup_custom_pages_table_model_.GetURLs(); 148 std::vector<GURL> urls = startup_custom_pages_table_model_.GetURLs();
149 urls[index] = fixed_url; 149 urls[index] = fixed_url;
150 startup_custom_pages_table_model_.SetURLs(urls); 150 startup_custom_pages_table_model_.SetURLs(urls);
151 SaveStartupPagesPref(); 151 SaveStartupPagesPref();
152 ResolveJavascriptCallback(*callback_id, base::FundamentalValue(true)); 152 ResolveJavascriptCallback(*callback_id, base::Value(true));
153 } else { 153 } else {
154 ResolveJavascriptCallback(*callback_id, base::FundamentalValue(false)); 154 ResolveJavascriptCallback(*callback_id, base::Value(false));
155 } 155 }
156 } 156 }
157 157
158 void StartupPagesHandler::HandleOnStartupPrefsPageLoad( 158 void StartupPagesHandler::HandleOnStartupPrefsPageLoad(
159 const base::ListValue* args) { 159 const base::ListValue* args) {
160 AllowJavascript(); 160 AllowJavascript();
161 } 161 }
162 162
163 void StartupPagesHandler::HandleRemoveStartupPage(const base::ListValue* args) { 163 void StartupPagesHandler::HandleRemoveStartupPage(const base::ListValue* args) {
164 int selected_index; 164 int selected_index;
(...skipping 22 matching lines...) Expand all
187 const base::ListValue* args) { 187 const base::ListValue* args) {
188 CHECK_EQ(args->GetSize(), 2U); 188 CHECK_EQ(args->GetSize(), 2U);
189 189
190 const base::Value* callback_id; 190 const base::Value* callback_id;
191 CHECK(args->Get(0, &callback_id)); 191 CHECK(args->Get(0, &callback_id));
192 192
193 std::string url_string; 193 std::string url_string;
194 CHECK(args->GetString(1, &url_string)); 194 CHECK(args->GetString(1, &url_string));
195 195
196 bool valid = settings_utils::FixupAndValidateStartupPage(url_string, nullptr); 196 bool valid = settings_utils::FixupAndValidateStartupPage(url_string, nullptr);
197 ResolveJavascriptCallback(*callback_id, base::FundamentalValue(valid)); 197 ResolveJavascriptCallback(*callback_id, base::Value(valid));
198 } 198 }
199 199
200 void StartupPagesHandler::SaveStartupPagesPref() { 200 void StartupPagesHandler::SaveStartupPagesPref() {
201 PrefService* prefs = Profile::FromWebUI(web_ui())->GetPrefs(); 201 PrefService* prefs = Profile::FromWebUI(web_ui())->GetPrefs();
202 202
203 SessionStartupPref pref = SessionStartupPref::GetStartupPref(prefs); 203 SessionStartupPref pref = SessionStartupPref::GetStartupPref(prefs);
204 pref.urls = startup_custom_pages_table_model_.GetURLs(); 204 pref.urls = startup_custom_pages_table_model_.GetURLs();
205 205
206 if (pref.urls.empty()) 206 if (pref.urls.empty())
207 pref.type = SessionStartupPref::DEFAULT; 207 pref.type = SessionStartupPref::DEFAULT;
208 208
209 SessionStartupPref::SetStartupPref(prefs, pref); 209 SessionStartupPref::SetStartupPref(prefs, pref);
210 } 210 }
211 211
212 void StartupPagesHandler::UpdateStartupPages() { 212 void StartupPagesHandler::UpdateStartupPages() {
213 const SessionStartupPref startup_pref = SessionStartupPref::GetStartupPref( 213 const SessionStartupPref startup_pref = SessionStartupPref::GetStartupPref(
214 Profile::FromWebUI(web_ui())->GetPrefs()); 214 Profile::FromWebUI(web_ui())->GetPrefs());
215 startup_custom_pages_table_model_.SetURLs(startup_pref.urls); 215 startup_custom_pages_table_model_.SetURLs(startup_pref.urls);
216 // The change will go to the JS code in the 216 // The change will go to the JS code in the
217 // StartupPagesHandler::OnModelChanged() method. 217 // StartupPagesHandler::OnModelChanged() method.
218 } 218 }
219 219
220 } // namespace settings 220 } // namespace settings
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698