chrome/browser/ui/views/options/general_page_view.cc - Issue 5046002: Cleanup: Include browser.h -> ui/browser.h [Part 2].

Side by Side Diff: chrome/browser/ui/views/options/general_page_view.cc

Issue 5046002: Cleanup: Include browser.h -> ui/browser.h [Part 2]. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 10 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 | Annotate | Revision Log

« no previous file with comments | « chrome/browser/ui/views/options/content_page_view.cc ('k') | chrome/browser/ui/views/options/plugin_filter_page_view.cc » ('j') | no next file with comments »

OLD	NEW
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/views/options/general_page_view.h"	5 #include "chrome/browser/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_number_conversions.h"	12 #include "base/string_number_conversions.h"

13 #include "base/string_util.h"	13 #include "base/string_util.h"

14 #include "base/utf_string_conversions.h"	14 #include "base/utf_string_conversions.h"

15 #include "chrome/browser/browser.h"

16 #include "chrome/browser/browser_window.h"	15 #include "chrome/browser/browser_window.h"

17 #include "chrome/browser/custom_home_pages_table_model.h"	16 #include "chrome/browser/custom_home_pages_table_model.h"

18 #include "chrome/browser/dom_ui/new_tab_ui.h"	17 #include "chrome/browser/dom_ui/new_tab_ui.h"

19 #include "chrome/browser/instant/instant_confirm_dialog.h"	18 #include "chrome/browser/instant/instant_confirm_dialog.h"

20 #include "chrome/browser/instant/instant_controller.h"	19 #include "chrome/browser/instant/instant_controller.h"

21 #include "chrome/browser/net/url_fixer_upper.h"	20 #include "chrome/browser/net/url_fixer_upper.h"

22 #include "chrome/browser/prefs/pref_service.h"	21 #include "chrome/browser/prefs/pref_service.h"

23 #include "chrome/browser/profile.h"	22 #include "chrome/browser/profile.h"

24 #include "chrome/browser/prefs/session_startup_pref.h"	23 #include "chrome/browser/prefs/session_startup_pref.h"

25 #include "chrome/browser/search_engines/template_url.h"	24 #include "chrome/browser/search_engines/template_url.h"

26 #include "chrome/browser/search_engines/template_url_model.h"	25 #include "chrome/browser/search_engines/template_url_model.h"

27 #include "chrome/browser/search_engines/template_url_model_observer.h"	26 #include "chrome/browser/search_engines/template_url_model_observer.h"

28 #include "chrome/browser/show_options_url.h"	27 #include "chrome/browser/show_options_url.h"

	28 #include "chrome/browser/ui/browser.h"

29 #include "chrome/browser/views/keyword_editor_view.h"	29 #include "chrome/browser/views/keyword_editor_view.h"

30 #include "chrome/browser/views/options/managed_prefs_banner_view.h"	30 #include "chrome/browser/views/options/managed_prefs_banner_view.h"

31 #include "chrome/browser/views/options/options_group_view.h"	31 #include "chrome/browser/views/options/options_group_view.h"

32 #include "chrome/common/chrome_constants.h"	32 #include "chrome/common/chrome_constants.h"

33 #include "chrome/common/pref_names.h"	33 #include "chrome/common/pref_names.h"

34 #include "chrome/common/url_constants.h"	34 #include "chrome/common/url_constants.h"

35 #include "chrome/installer/util/browser_distribution.h"	35 #include "chrome/installer/util/browser_distribution.h"

36 #include "grit/chromium_strings.h"	36 #include "grit/chromium_strings.h"

37 #include "grit/generated_resources.h"	37 #include "grit/generated_resources.h"

38 #include "views/controls/button/radio_button.h"	38 #include "views/controls/button/radio_button.h"

(...skipping 854 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
893 }	893 }

894 homepage_use_url_textfield_->SetEnabled(enabled);	894 homepage_use_url_textfield_->SetEnabled(enabled);

895 homepage_use_url_textfield_->SetReadOnly(!enabled);	895 homepage_use_url_textfield_->SetReadOnly(!enabled);

896 }	896 }

897	897

898 void GeneralPageView::SetDefaultSearchProvider() {	898 void GeneralPageView::SetDefaultSearchProvider() {

899 const int index = default_search_engine_combobox_->selected_item();	899 const int index = default_search_engine_combobox_->selected_item();

900 default_search_engines_model_->model()->SetDefaultSearchProvider(	900 default_search_engines_model_->model()->SetDefaultSearchProvider(

901 default_search_engines_model_->GetTemplateURLAt(index));	901 default_search_engines_model_->GetTemplateURLAt(index));

902 }	902 }

OLD	NEW