chrome/browser/views/options/general_page_view.cc - Issue 18305: Move url_* to net subdir

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

Issue 18305: Move url_* to net subdir (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

Patch Set: Created 11 years, 11 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 | Annotate | Revision Log

« no previous file with comments | « chrome/browser/views/edit_keyword_controller.cc ('k') | chrome/browser/views/shelf_item_dialog.cc » ('j') | no next file with comments »

OLD	NEW
1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2006-2008 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 "base/gfx/png_decoder.h"	7 #include "base/gfx/png_decoder.h"

8 #include "base/message_loop.h"	8 #include "base/message_loop.h"

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

10 #include "base/thread.h"	10 #include "base/thread.h"

11 #include "chrome/app/theme/theme_resources.h"	11 #include "chrome/app/theme/theme_resources.h"

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

13 #include "chrome/browser/browser_list.h"	13 #include "chrome/browser/browser_list.h"

14 #include "chrome/browser/browser_process.h"	14 #include "chrome/browser/browser_process.h"

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

16 #include "chrome/browser/history/history.h"	16 #include "chrome/browser/history/history.h"

	17 #include "chrome/browser/net/url_fixer_upper.h"

17 #include "chrome/browser/profile.h"	18 #include "chrome/browser/profile.h"

18 #include "chrome/browser/session_startup_pref.h"	19 #include "chrome/browser/session_startup_pref.h"

19 #include "chrome/browser/search_engines/template_url.h"	20 #include "chrome/browser/search_engines/template_url.h"

20 #include "chrome/browser/search_engines/template_url_model.h"	21 #include "chrome/browser/search_engines/template_url_model.h"

21 #include "chrome/browser/shell_integration.h"	22 #include "chrome/browser/shell_integration.h"

22 #include "chrome/browser/url_fixer_upper.h"

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

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

25 #include "chrome/browser/views/standard_layout.h"	25 #include "chrome/browser/views/standard_layout.h"

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

27 #include "chrome/common/l10n_util.h"	27 #include "chrome/common/l10n_util.h"

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

29 #include "chrome/common/pref_service.h"	29 #include "chrome/common/pref_service.h"

30 #include "chrome/common/resource_bundle.h"	30 #include "chrome/common/resource_bundle.h"

31 #include "chrome/views/checkbox.h"	31 #include "chrome/views/checkbox.h"

32 #include "chrome/views/grid_layout.h"	32 #include "chrome/views/grid_layout.h"

(...skipping 1046 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
1079 homepage_use_url_textfield_->SetReadOnly(true);	1079 homepage_use_url_textfield_->SetReadOnly(true);

1080 }	1080 }

1081 }	1081 }

1082	1082

1083 void GeneralPageView::SetDefaultSearchProvider() {	1083 void GeneralPageView::SetDefaultSearchProvider() {

1084 const int index = default_search_engine_combobox_->GetSelectedItem();	1084 const int index = default_search_engine_combobox_->GetSelectedItem();

1085 default_search_engines_model_->model()->SetDefaultSearchProvider(	1085 default_search_engines_model_->model()->SetDefaultSearchProvider(

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

1087 }	1087 }

1088	1088

OLD	NEW