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

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

Issue 1869883003: MD Settings: On Startup, extract dialog to its own file. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Typo Created 4 years, 8 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
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 <string> 7 #include <string>
8 #include <vector> 8 #include <vector>
9 9
10 #include "chrome/browser/prefs/session_startup_pref.h" 10 #include "chrome/browser/prefs/session_startup_pref.h"
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
74 74
75 void StartupPagesHandler::OnItemsAdded(int start, int length) { 75 void StartupPagesHandler::OnItemsAdded(int start, int length) {
76 OnModelChanged(); 76 OnModelChanged();
77 } 77 }
78 78
79 void StartupPagesHandler::OnItemsRemoved(int start, int length) { 79 void StartupPagesHandler::OnItemsRemoved(int start, int length) {
80 OnModelChanged(); 80 OnModelChanged();
81 } 81 }
82 82
83 void StartupPagesHandler::HandleAddStartupPage(const base::ListValue* args) { 83 void StartupPagesHandler::HandleAddStartupPage(const base::ListValue* args) {
84 CHECK_EQ(2U, args->GetSize());
Dan Beam 2016/04/08 23:24:42 nit: \n
dpapad 2016/04/09 00:02:18 Done.
85 const base::Value* callback_id;
86 CHECK(args->Get(0, &callback_id));
Dan Beam 2016/04/08 23:24:42 nit: \n
dpapad 2016/04/09 00:02:18 Done.
84 std::string url_string; 87 std::string url_string;
85 if (!args->GetString(0, &url_string)) { 88 CHECK(args->GetString(1, &url_string));
86 NOTREACHED(); 89
90 GURL url;
91 if (!settings_utils::FixupAndValidateStartupPage(url_string, &url)) {
92 ResolveJavascriptCallback(*callback_id, base::FundamentalValue(false));
87 return; 93 return;
88 } 94 }
89 95
90 GURL url;
91 if (!settings_utils::FixupAndValidateStartupPage(url_string, &url)) {
92 NOTREACHED();
93 return;
94 }
95
96 int row_count = startup_custom_pages_table_model_.RowCount(); 96 int row_count = startup_custom_pages_table_model_.RowCount();
97 int index; 97 int index;
98 if (!args->GetInteger(1, &index) || index > row_count) 98 if (!args->GetInteger(1, &index) || index > row_count)
99 index = row_count; 99 index = row_count;
100 100
101 startup_custom_pages_table_model_.Add(index, url); 101 startup_custom_pages_table_model_.Add(index, url);
102 SaveStartupPagesPref(); 102 SaveStartupPagesPref();
103 ResolveJavascriptCallback(*callback_id, base::FundamentalValue(true));
103 } 104 }
104 105
105 void StartupPagesHandler::HandleOnStartupPrefsPageLoad( 106 void StartupPagesHandler::HandleOnStartupPrefsPageLoad(
106 const base::ListValue* args) { 107 const base::ListValue* args) {
107 startup_custom_pages_table_model_.SetObserver(this); 108 startup_custom_pages_table_model_.SetObserver(this);
108 109
109 PrefService* prefService = Profile::FromWebUI(web_ui())->GetPrefs(); 110 PrefService* prefService = Profile::FromWebUI(web_ui())->GetPrefs();
110 SessionStartupPref pref = SessionStartupPref::GetStartupPref( 111 SessionStartupPref pref = SessionStartupPref::GetStartupPref(
111 prefService); 112 prefService);
112 startup_custom_pages_table_model_.SetURLs(pref.urls); 113 startup_custom_pages_table_model_.SetURLs(pref.urls);
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
176 177
177 void StartupPagesHandler::UpdateStartupPages() { 178 void StartupPagesHandler::UpdateStartupPages() {
178 const SessionStartupPref startup_pref = SessionStartupPref::GetStartupPref( 179 const SessionStartupPref startup_pref = SessionStartupPref::GetStartupPref(
179 Profile::FromWebUI(web_ui())->GetPrefs()); 180 Profile::FromWebUI(web_ui())->GetPrefs());
180 startup_custom_pages_table_model_.SetURLs(startup_pref.urls); 181 startup_custom_pages_table_model_.SetURLs(startup_pref.urls);
181 // The change will go to the JS code in the 182 // The change will go to the JS code in the
182 // StartupPagesHandler::OnModelChanged() method. 183 // StartupPagesHandler::OnModelChanged() method.
183 } 184 }
184 185
185 } // namespace settings 186 } // namespace settings
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698