| OLD | NEW |
| 1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2009 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/views/options/general_page_view.h" | 5 #include "chrome/browser/views/options/general_page_view.h" |
| 6 | 6 |
| 7 #include "app/l10n_util.h" | 7 #include "app/l10n_util.h" |
| 8 #include "app/resource_bundle.h" | 8 #include "app/resource_bundle.h" |
| 9 #include "base/gfx/png_decoder.h" | 9 #include "base/gfx/png_decoder.h" |
| 10 #include "base/message_loop.h" | 10 #include "base/message_loop.h" |
| (...skipping 503 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 514 homepage_group_(NULL), | 514 homepage_group_(NULL), |
| 515 homepage_use_newtab_radio_(NULL), | 515 homepage_use_newtab_radio_(NULL), |
| 516 homepage_use_url_radio_(NULL), | 516 homepage_use_url_radio_(NULL), |
| 517 homepage_use_url_textfield_(NULL), | 517 homepage_use_url_textfield_(NULL), |
| 518 homepage_show_home_button_checkbox_(NULL), | 518 homepage_show_home_button_checkbox_(NULL), |
| 519 default_search_group_(NULL), | 519 default_search_group_(NULL), |
| 520 default_search_manage_engines_button_(NULL), | 520 default_search_manage_engines_button_(NULL), |
| 521 default_browser_group_(NULL), | 521 default_browser_group_(NULL), |
| 522 default_browser_status_label_(NULL), | 522 default_browser_status_label_(NULL), |
| 523 default_browser_use_as_default_button_(NULL), | 523 default_browser_use_as_default_button_(NULL), |
| 524 default_browser_worker_(new DefaultBrowserWorker(this)), | 524 ALLOW_THIS_IN_INITIALIZER_LIST( |
| 525 default_browser_worker_(new DefaultBrowserWorker(this))), |
| 525 OptionsPageView(profile) { | 526 OptionsPageView(profile) { |
| 526 } | 527 } |
| 527 | 528 |
| 528 GeneralPageView::~GeneralPageView() { | 529 GeneralPageView::~GeneralPageView() { |
| 529 profile()->GetPrefs()->RemovePrefObserver(prefs::kRestoreOnStartup, this); | 530 profile()->GetPrefs()->RemovePrefObserver(prefs::kRestoreOnStartup, this); |
| 530 profile()->GetPrefs()->RemovePrefObserver( | 531 profile()->GetPrefs()->RemovePrefObserver( |
| 531 prefs::kURLsToRestoreOnStartup, this); | 532 prefs::kURLsToRestoreOnStartup, this); |
| 532 if (startup_custom_pages_table_) | 533 if (startup_custom_pages_table_) |
| 533 startup_custom_pages_table_->SetModel(NULL); | 534 startup_custom_pages_table_->SetModel(NULL); |
| 534 default_browser_worker_->ViewDestroyed(); | 535 default_browser_worker_->ViewDestroyed(); |
| (...skipping 546 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1081 homepage_use_url_textfield_->SetEnabled(false); | 1082 homepage_use_url_textfield_->SetEnabled(false); |
| 1082 homepage_use_url_textfield_->SetReadOnly(true); | 1083 homepage_use_url_textfield_->SetReadOnly(true); |
| 1083 } | 1084 } |
| 1084 } | 1085 } |
| 1085 | 1086 |
| 1086 void GeneralPageView::SetDefaultSearchProvider() { | 1087 void GeneralPageView::SetDefaultSearchProvider() { |
| 1087 const int index = default_search_engine_combobox_->GetSelectedItem(); | 1088 const int index = default_search_engine_combobox_->GetSelectedItem(); |
| 1088 default_search_engines_model_->model()->SetDefaultSearchProvider( | 1089 default_search_engines_model_->model()->SetDefaultSearchProvider( |
| 1089 default_search_engines_model_->GetTemplateURLAt(index)); | 1090 default_search_engines_model_->GetTemplateURLAt(index)); |
| 1090 } | 1091 } |
| OLD | NEW |