| OLD | NEW |
| 1 // Copyright (c) 2010 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/views/options/general_page_view.h" | 5 #include "chrome/browser/ui/views/options/general_page_view.h" |
| 6 | 6 |
| 7 #include "app/combobox_model.h" | 7 #include "app/combobox_model.h" |
| 8 #include "app/l10n_util.h" | 8 #include "app/l10n_util.h" |
| 9 #include "base/callback.h" | 9 #include "base/callback.h" |
| 10 #include "base/message_loop.h" | 10 #include "base/message_loop.h" |
| 11 #include "base/string16.h" | 11 #include "base/string16.h" |
| 12 #include "base/string_util.h" | 12 #include "base/string_util.h" |
| 13 #include "base/utf_string_conversions.h" | 13 #include "base/utf_string_conversions.h" |
| 14 #include "chrome/browser/browser_window.h" | 14 #include "chrome/browser/browser_window.h" |
| 15 #include "chrome/browser/custom_home_pages_table_model.h" | 15 #include "chrome/browser/custom_home_pages_table_model.h" |
| (...skipping 871 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 887 } | 887 } |
| 888 homepage_use_url_textfield_->SetEnabled(enabled); | 888 homepage_use_url_textfield_->SetEnabled(enabled); |
| 889 homepage_use_url_textfield_->SetReadOnly(!enabled); | 889 homepage_use_url_textfield_->SetReadOnly(!enabled); |
| 890 } | 890 } |
| 891 | 891 |
| 892 void GeneralPageView::SetDefaultSearchProvider() { | 892 void GeneralPageView::SetDefaultSearchProvider() { |
| 893 const int index = default_search_engine_combobox_->selected_item(); | 893 const int index = default_search_engine_combobox_->selected_item(); |
| 894 default_search_engines_model_->model()->SetDefaultSearchProvider( | 894 default_search_engines_model_->model()->SetDefaultSearchProvider( |
| 895 default_search_engines_model_->GetTemplateURLAt(index)); | 895 default_search_engines_model_->GetTemplateURLAt(index)); |
| 896 } | 896 } |
| OLD | NEW |