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

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

Issue 274040: More style nits. (Closed)
Patch Set: Created 11 years, 2 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) 2006-2009 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2006-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/gtk/options/general_page_gtk.h" 5 #include "chrome/browser/gtk/options/general_page_gtk.h"
6 6
7 #include "app/l10n_util.h" 7 #include "app/l10n_util.h"
8 #include "chrome/browser/browser.h" 8 #include "chrome/browser/browser.h"
9 #include "chrome/browser/browser_list.h" 9 #include "chrome/browser/browser_list.h"
10 #include "chrome/browser/gtk/keyword_editor_view.h" 10 #include "chrome/browser/gtk/keyword_editor_view.h"
(...skipping 30 matching lines...) Expand all
41 COL_COUNT, 41 COL_COUNT,
42 }; 42 };
43 43
44 // Column ids for |default_search_engines_model_|. 44 // Column ids for |default_search_engines_model_|.
45 enum { 45 enum {
46 SEARCH_ENGINES_COL_INDEX, 46 SEARCH_ENGINES_COL_INDEX,
47 SEARCH_ENGINES_COL_TITLE, 47 SEARCH_ENGINES_COL_TITLE,
48 SEARCH_ENGINES_COL_COUNT, 48 SEARCH_ENGINES_COL_COUNT,
49 }; 49 };
50 50
51 } 51 } // namespace
52 52
53 /////////////////////////////////////////////////////////////////////////////// 53 ///////////////////////////////////////////////////////////////////////////////
54 // GeneralPageGtk, public: 54 // GeneralPageGtk, public:
55 55
56 GeneralPageGtk::GeneralPageGtk(Profile* profile) 56 GeneralPageGtk::GeneralPageGtk(Profile* profile)
57 : OptionsPageBase(profile), 57 : OptionsPageBase(profile),
58 template_url_model_(NULL), 58 template_url_model_(NULL),
59 default_search_initializing_(true), 59 default_search_initializing_(true),
60 initializing_(true), 60 initializing_(true),
61 default_browser_worker_( 61 default_browser_worker_(
(...skipping 647 matching lines...) Expand 10 before | Expand all | Expand 10 after
709 if (color) { 709 if (color) {
710 char* markup = g_markup_printf_escaped(kDefaultBrowserLabelMarkup, 710 char* markup = g_markup_printf_escaped(kDefaultBrowserLabelMarkup,
711 color, text.c_str()); 711 color, text.c_str());
712 gtk_label_set_markup(GTK_LABEL(default_browser_status_label_), markup); 712 gtk_label_set_markup(GTK_LABEL(default_browser_status_label_), markup);
713 g_free(markup); 713 g_free(markup);
714 } 714 }
715 715
716 gtk_widget_set_sensitive(default_browser_use_as_default_button_, 716 gtk_widget_set_sensitive(default_browser_use_as_default_button_,
717 state == ShellIntegration::STATE_NOT_DEFAULT); 717 state == ShellIntegration::STATE_NOT_DEFAULT);
718 } 718 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698