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

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

Issue 3203008: Move prefs-related files under chrome/browser/ into a prefs/ subdir. (Closed) Base URL: http://src.chromium.org/git/chromium.git
Patch Set: Created 10 years, 4 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
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"
11 #include "base/callback.h" 11 #include "base/callback.h"
12 #include "base/gtk_util.h" 12 #include "base/gtk_util.h"
13 #include "base/utf_string_conversions.h" 13 #include "base/utf_string_conversions.h"
14 #include "chrome/browser/custom_home_pages_table_model.h" 14 #include "chrome/browser/custom_home_pages_table_model.h"
15 #include "chrome/browser/gtk/accessible_widget_helper_gtk.h" 15 #include "chrome/browser/gtk/accessible_widget_helper_gtk.h"
16 #include "chrome/browser/gtk/gtk_util.h" 16 #include "chrome/browser/gtk/gtk_util.h"
17 #include "chrome/browser/gtk/keyword_editor_view.h" 17 #include "chrome/browser/gtk/keyword_editor_view.h"
18 #include "chrome/browser/gtk/options/managed_prefs_banner_gtk.h" 18 #include "chrome/browser/gtk/options/managed_prefs_banner_gtk.h"
19 #include "chrome/browser/gtk/options/options_layout_gtk.h" 19 #include "chrome/browser/gtk/options/options_layout_gtk.h"
20 #include "chrome/browser/gtk/options/url_picker_dialog_gtk.h" 20 #include "chrome/browser/gtk/options/url_picker_dialog_gtk.h"
21 #include "chrome/browser/net/url_fixer_upper.h" 21 #include "chrome/browser/net/url_fixer_upper.h"
22 #include "chrome/browser/pref_service.h" 22 #include "chrome/browser/prefs/pref_service.h"
23 #include "chrome/browser/prefs/session_startup_pref.h"
23 #include "chrome/browser/profile.h" 24 #include "chrome/browser/profile.h"
24 #include "chrome/browser/search_engines/template_url.h" 25 #include "chrome/browser/search_engines/template_url.h"
25 #include "chrome/browser/session_startup_pref.h"
26 #include "chrome/common/notification_service.h" 26 #include "chrome/common/notification_service.h"
27 #include "chrome/common/pref_names.h" 27 #include "chrome/common/pref_names.h"
28 #include "chrome/common/url_constants.h" 28 #include "chrome/common/url_constants.h"
29 #include "gfx/gtk_util.h" 29 #include "gfx/gtk_util.h"
30 #include "grit/chromium_strings.h" 30 #include "grit/chromium_strings.h"
31 #include "grit/generated_resources.h" 31 #include "grit/generated_resources.h"
32 32
33 namespace { 33 namespace {
34 34
35 // Markup for the text showing the current state of the default browser 35 // Markup for the text showing the current state of the default browser
(...skipping 669 matching lines...) Expand 10 before | Expand all | Expand 10 after
705 if (color) { 705 if (color) {
706 char* markup = g_markup_printf_escaped(kDefaultBrowserLabelMarkup, 706 char* markup = g_markup_printf_escaped(kDefaultBrowserLabelMarkup,
707 color, text.c_str()); 707 color, text.c_str());
708 gtk_label_set_markup(GTK_LABEL(default_browser_status_label_), markup); 708 gtk_label_set_markup(GTK_LABEL(default_browser_status_label_), markup);
709 g_free(markup); 709 g_free(markup);
710 } 710 }
711 711
712 gtk_widget_set_sensitive(default_browser_use_as_default_button_, 712 gtk_widget_set_sensitive(default_browser_use_as_default_button_,
713 state == ShellIntegration::STATE_NOT_DEFAULT); 713 state == ShellIntegration::STATE_NOT_DEFAULT);
714 } 714 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698