Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(239)

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

Issue 65012: Move skia to DEPS, and put it in third_party. (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
OLDNEW
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 13 matching lines...) Expand all
24 #include "chrome/browser/views/keyword_editor_view.h" 24 #include "chrome/browser/views/keyword_editor_view.h"
25 #include "chrome/browser/views/options/options_group_view.h" 25 #include "chrome/browser/views/options/options_group_view.h"
26 #include "chrome/browser/dom_ui/new_tab_ui.h" 26 #include "chrome/browser/dom_ui/new_tab_ui.h"
27 #include "chrome/common/chrome_constants.h" 27 #include "chrome/common/chrome_constants.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/url_constants.h" 30 #include "chrome/common/url_constants.h"
31 #include "grit/chromium_strings.h" 31 #include "grit/chromium_strings.h"
32 #include "grit/generated_resources.h" 32 #include "grit/generated_resources.h"
33 #include "grit/theme_resources.h" 33 #include "grit/theme_resources.h"
34 #include "skia/include/SkBitmap.h" 34 #include "third_party/skia/include/core/SkBitmap.h"
35 #include "views/controls/button/radio_button.h" 35 #include "views/controls/button/radio_button.h"
36 #include "views/controls/label.h" 36 #include "views/controls/label.h"
37 #include "views/controls/table/table_view.h" 37 #include "views/controls/table/table_view.h"
38 #include "views/controls/text_field.h" 38 #include "views/controls/text_field.h"
39 #include "views/grid_layout.h" 39 #include "views/grid_layout.h"
40 #include "views/standard_layout.h" 40 #include "views/standard_layout.h"
41 41
42 namespace { 42 namespace {
43 43
44 static const int kStartupRadioGroup = 1; 44 static const int kStartupRadioGroup = 1;
(...skipping 1036 matching lines...) Expand 10 before | Expand all | Expand 10 after
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 }
OLDNEW
« no previous file with comments | « chrome/browser/views/options/fonts_page_view.cc ('k') | chrome/browser/views/options/languages_page_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698