chrome/browser/views/options/general_page_view.cc - Issue 109043: Move l10n_util to app/

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

Issue 109043: Move l10n_util to app/ (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

Patch Set: '' Created 11 years, 7 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/options/fonts_page_view.cc ('k') | chrome/browser/views/options/language_combobox_model.cc » ('j') | no next file with comments »

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/resource_bundle.h"	8 #include "app/resource_bundle.h"

8 #include "base/gfx/png_decoder.h"	9 #include "base/gfx/png_decoder.h"

9 #include "base/message_loop.h"	10 #include "base/message_loop.h"

10 #include "base/string_util.h"	11 #include "base/string_util.h"

11 #include "base/thread.h"	12 #include "base/thread.h"

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

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

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

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

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

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

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

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

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

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

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

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

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

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

26 #include "chrome/browser/dom_ui/new_tab_ui.h"	27 #include "chrome/browser/dom_ui/new_tab_ui.h"

27 #include "chrome/common/chrome_constants.h"	28 #include "chrome/common/chrome_constants.h"

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

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

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

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

32 #include "chrome/views/controls/button/radio_button.h"	32 #include "chrome/views/controls/button/radio_button.h"

33 #include "chrome/views/controls/label.h"	33 #include "chrome/views/controls/label.h"

34 #include "chrome/views/controls/table/table_view.h"	34 #include "chrome/views/controls/table/table_view.h"

35 #include "chrome/views/controls/text_field.h"	35 #include "chrome/views/controls/text_field.h"

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

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

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

(...skipping 1042 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
1081 homepage_use_url_textfield_->SetEnabled(false);	1081 homepage_use_url_textfield_->SetEnabled(false);

1082 homepage_use_url_textfield_->SetReadOnly(true);	1082 homepage_use_url_textfield_->SetReadOnly(true);

1083 }	1083 }

1084 }	1084 }

1085	1085

1086 void GeneralPageView::SetDefaultSearchProvider() {	1086 void GeneralPageView::SetDefaultSearchProvider() {

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

1088 default_search_engines_model_->model()->SetDefaultSearchProvider(	1088 default_search_engines_model_->model()->SetDefaultSearchProvider(

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

1090 }	1090 }

OLD	NEW