| 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/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 11 matching lines...) Expand all Loading... |
| 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" | 31 #include "chrome/common/chrome_switches.h" |
| 32 #include "chrome/common/notification_service.h" | |
| 33 #include "chrome/common/pref_names.h" | 32 #include "chrome/common/pref_names.h" |
| 34 #include "chrome/common/url_constants.h" | 33 #include "chrome/common/url_constants.h" |
| 35 #include "gfx/gtk_util.h" | 34 #include "gfx/gtk_util.h" |
| 36 #include "grit/chromium_strings.h" | 35 #include "grit/chromium_strings.h" |
| 37 #include "grit/generated_resources.h" | 36 #include "grit/generated_resources.h" |
| 38 | 37 |
| 39 namespace { | 38 namespace { |
| 40 | 39 |
| 41 // Markup for the text showing the current state of the default browser | 40 // Markup for the text showing the current state of the default browser |
| 42 const char kDefaultBrowserLabelMarkup[] = "<span color='#%s'>%s</span>"; | 41 const char kDefaultBrowserLabelMarkup[] = "<span color='#%s'>%s</span>"; |
| (...skipping 755 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 798 int desired_width = allocation->x - sender->parent->allocation.x; | 797 int desired_width = allocation->x - sender->parent->allocation.x; |
| 799 GtkRequisition req; | 798 GtkRequisition req; |
| 800 gtk_widget_size_request(instant_indent_, &req); | 799 gtk_widget_size_request(instant_indent_, &req); |
| 801 if (req.width != desired_width) | 800 if (req.width != desired_width) |
| 802 gtk_widget_set_size_request(instant_indent_, desired_width, -1); | 801 gtk_widget_set_size_request(instant_indent_, desired_width, -1); |
| 803 } | 802 } |
| 804 | 803 |
| 805 void GeneralPageGtk::OnSearchLearnMoreClicked(GtkWidget* sender) { | 804 void GeneralPageGtk::OnSearchLearnMoreClicked(GtkWidget* sender) { |
| 806 browser::ShowOptionsURL(profile(), browser::InstantLearnMoreURL()); | 805 browser::ShowOptionsURL(profile(), browser::InstantLearnMoreURL()); |
| 807 } | 806 } |
| OLD | NEW |