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

Side by Side Diff: chrome/browser/gtk/options/general_page_gtk.cc

Issue 6086003: Cleanup: Remove unneeded includes of chrome_switches.h. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 9 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
OLDNEW
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/gtk/options/general_page_gtk.h" 5 #include "chrome/browser/gtk/options/general_page_gtk.h"
6 6
7 #include <set> 7 #include <set>
8 #include <vector> 8 #include <vector>
9 9
10 #include "app/l10n_util.h" 10 #include "app/l10n_util.h"
(...skipping 10 matching lines...) Expand all
21 #include "chrome/browser/gtk/options/url_picker_dialog_gtk.h" 21 #include "chrome/browser/gtk/options/url_picker_dialog_gtk.h"
22 #include "chrome/browser/instant/instant_confirm_dialog.h" 22 #include "chrome/browser/instant/instant_confirm_dialog.h"
23 #include "chrome/browser/instant/instant_controller.h" 23 #include "chrome/browser/instant/instant_controller.h"
24 #include "chrome/browser/net/url_fixer_upper.h" 24 #include "chrome/browser/net/url_fixer_upper.h"
25 #include "chrome/browser/prefs/pref_service.h" 25 #include "chrome/browser/prefs/pref_service.h"
26 #include "chrome/browser/prefs/session_startup_pref.h" 26 #include "chrome/browser/prefs/session_startup_pref.h"
27 #include "chrome/browser/profiles/profile.h" 27 #include "chrome/browser/profiles/profile.h"
28 #include "chrome/browser/search_engines/template_url.h" 28 #include "chrome/browser/search_engines/template_url.h"
29 #include "chrome/browser/search_engines/template_url_model.h" 29 #include "chrome/browser/search_engines/template_url_model.h"
30 #include "chrome/browser/ui/options/show_options_url.h" 30 #include "chrome/browser/ui/options/show_options_url.h"
31 #include "chrome/common/chrome_switches.h"
32 #include "chrome/common/pref_names.h" 31 #include "chrome/common/pref_names.h"
33 #include "chrome/common/url_constants.h" 32 #include "chrome/common/url_constants.h"
34 #include "gfx/gtk_util.h" 33 #include "gfx/gtk_util.h"
35 #include "grit/chromium_strings.h" 34 #include "grit/chromium_strings.h"
36 #include "grit/generated_resources.h" 35 #include "grit/generated_resources.h"
37 36
38 namespace { 37 namespace {
39 38
40 // Markup for the text showing the current state of the default browser 39 // Markup for the text showing the current state of the default browser
41 const char kDefaultBrowserLabelMarkup[] = "<span color='#%s'>%s</span>"; 40 const char kDefaultBrowserLabelMarkup[] = "<span color='#%s'>%s</span>";
(...skipping 755 matching lines...) Expand 10 before | Expand all | Expand 10 after
797 int desired_width = allocation->x - sender->parent->allocation.x; 796 int desired_width = allocation->x - sender->parent->allocation.x;
798 GtkRequisition req; 797 GtkRequisition req;
799 gtk_widget_size_request(instant_indent_, &req); 798 gtk_widget_size_request(instant_indent_, &req);
800 if (req.width != desired_width) 799 if (req.width != desired_width)
801 gtk_widget_set_size_request(instant_indent_, desired_width, -1); 800 gtk_widget_set_size_request(instant_indent_, desired_width, -1);
802 } 801 }
803 802
804 void GeneralPageGtk::OnSearchLearnMoreClicked(GtkWidget* sender) { 803 void GeneralPageGtk::OnSearchLearnMoreClicked(GtkWidget* sender) {
805 browser::ShowOptionsURL(profile(), browser::InstantLearnMoreURL()); 804 browser::ShowOptionsURL(profile(), browser::InstantLearnMoreURL());
806 } 805 }
OLDNEW
« no previous file with comments | « chrome/browser/gtk/options/cookie_filter_page_gtk.cc ('k') | chrome/browser/history/history_backend.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698