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

Side by Side Diff: chrome/browser/dom_ui/options/browser_options_handler.cc

Issue 5582002: Move:... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 10 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) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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/dom_ui/options/browser_options_handler.h" 5 #include "chrome/browser/dom_ui/options/browser_options_handler.h"
6 6
7 #include "app/l10n_util.h" 7 #include "app/l10n_util.h"
8 #include "base/basictypes.h" 8 #include "base/basictypes.h"
9 #include "base/scoped_ptr.h" 9 #include "base/scoped_ptr.h"
10 #include "base/singleton.h" 10 #include "base/singleton.h"
11 #include "base/string_number_conversions.h" 11 #include "base/string_number_conversions.h"
12 #include "base/utf_string_conversions.h" 12 #include "base/utf_string_conversions.h"
13 #include "base/values.h" 13 #include "base/values.h"
14 #include "chrome/browser/browser_thread.h" 14 #include "chrome/browser/browser_thread.h"
15 #include "chrome/browser/custom_home_pages_table_model.h" 15 #include "chrome/browser/custom_home_pages_table_model.h"
16 #include "chrome/browser/dom_ui/dom_ui_favicon_source.h" 16 #include "chrome/browser/dom_ui/dom_ui_favicon_source.h"
17 #include "chrome/browser/dom_ui/options/options_managed_banner_handler.h" 17 #include "chrome/browser/dom_ui/options/options_managed_banner_handler.h"
18 #include "chrome/browser/instant/instant_confirm_dialog.h" 18 #include "chrome/browser/instant/instant_confirm_dialog.h"
19 #include "chrome/browser/metrics/user_metrics.h" 19 #include "chrome/browser/metrics/user_metrics.h"
20 #include "chrome/browser/net/url_fixer_upper.h" 20 #include "chrome/browser/net/url_fixer_upper.h"
21 #include "chrome/browser/options_window.h"
22 #include "chrome/browser/prefs/session_startup_pref.h" 21 #include "chrome/browser/prefs/session_startup_pref.h"
23 #include "chrome/browser/profile.h" 22 #include "chrome/browser/profile.h"
24 #include "chrome/browser/search_engines/template_url.h" 23 #include "chrome/browser/search_engines/template_url.h"
25 #include "chrome/browser/search_engines/template_url_model.h" 24 #include "chrome/browser/search_engines/template_url_model.h"
25 #include "chrome/browser/ui/options/options_window.h"
26 #include "chrome/installer/util/browser_distribution.h" 26 #include "chrome/installer/util/browser_distribution.h"
27 #include "grit/chromium_strings.h" 27 #include "grit/chromium_strings.h"
28 #include "grit/generated_resources.h" 28 #include "grit/generated_resources.h"
29 29
30 BrowserOptionsHandler::BrowserOptionsHandler() 30 BrowserOptionsHandler::BrowserOptionsHandler()
31 : template_url_model_(NULL), startup_custom_pages_table_model_(NULL) { 31 : template_url_model_(NULL), startup_custom_pages_table_model_(NULL) {
32 #if !defined(OS_MACOSX) 32 #if !defined(OS_MACOSX)
33 default_browser_worker_ = new ShellIntegration::DefaultBrowserWorker(this); 33 default_browser_worker_ = new ShellIntegration::DefaultBrowserWorker(this);
34 #endif 34 #endif
35 } 35 }
(...skipping 315 matching lines...) Expand 10 before | Expand all | Expand 10 after
351 } 351 }
352 352
353 void BrowserOptionsHandler::SaveStartupPagesPref() { 353 void BrowserOptionsHandler::SaveStartupPagesPref() {
354 PrefService* prefs = dom_ui_->GetProfile()->GetPrefs(); 354 PrefService* prefs = dom_ui_->GetProfile()->GetPrefs();
355 355
356 SessionStartupPref pref = SessionStartupPref::GetStartupPref(prefs); 356 SessionStartupPref pref = SessionStartupPref::GetStartupPref(prefs);
357 pref.urls = startup_custom_pages_table_model_->GetURLs(); 357 pref.urls = startup_custom_pages_table_model_->GetURLs();
358 358
359 SessionStartupPref::SetStartupPref(prefs, pref); 359 SessionStartupPref::SetStartupPref(prefs, pref);
360 } 360 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698