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

Side by Side Diff: chrome/browser/ui/gtk/options/content_page_gtk.cc

Issue 6532033: Disable "Reset to Default theme"/"Use classic theme" correctly. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 10 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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/ui/gtk/options/content_page_gtk.h" 5 #include "chrome/browser/ui/gtk/options/content_page_gtk.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/utf_string_conversions.h" 10 #include "base/utf_string_conversions.h"
(...skipping 183 matching lines...) Expand 10 before | Expand all | Expand 10 after
194 #if defined(TOOLKIT_GTK) 194 #if defined(TOOLKIT_GTK)
195 GtkThemeProvider* provider = GtkThemeProvider::GetFrom(profile()); 195 GtkThemeProvider* provider = GtkThemeProvider::GetFrom(profile());
196 bool is_gtk_theme = provider->UseGtkTheme(); 196 bool is_gtk_theme = provider->UseGtkTheme();
197 gtk_widget_set_sensitive(gtk_theme_button_, !is_gtk_theme); 197 gtk_widget_set_sensitive(gtk_theme_button_, !is_gtk_theme);
198 #else 198 #else
199 BrowserThemeProvider* provider = 199 BrowserThemeProvider* provider =
200 reinterpret_cast<BrowserThemeProvider*>(profile()->GetThemeProvider()); 200 reinterpret_cast<BrowserThemeProvider*>(profile()->GetThemeProvider());
201 bool is_gtk_theme = false; 201 bool is_gtk_theme = false;
202 #endif 202 #endif
203 203
204 bool is_classic_theme = !is_gtk_theme && provider->GetThemeID().empty(); 204 bool is_classic_theme = !is_gtk_theme && provider->UsingDefaultTheme();
205 gtk_widget_set_sensitive(themes_reset_button_, !is_classic_theme); 205 gtk_widget_set_sensitive(themes_reset_button_, !is_classic_theme);
206 } 206 }
207 207
208 GtkWidget* ContentPageGtk::InitPasswordSavingGroup() { 208 GtkWidget* ContentPageGtk::InitPasswordSavingGroup() {
209 GtkWidget* vbox = gtk_vbox_new(FALSE, gtk_util::kControlSpacing); 209 GtkWidget* vbox = gtk_vbox_new(FALSE, gtk_util::kControlSpacing);
210 210
211 // Ask to save radio button. 211 // Ask to save radio button.
212 passwords_asktosave_radio_ = gtk_radio_button_new_with_label(NULL, 212 passwords_asktosave_radio_ = gtk_radio_button_new_with_label(NULL,
213 l10n_util::GetStringUTF8(IDS_OPTIONS_PASSWORDS_ASKTOSAVE).c_str()); 213 l10n_util::GetStringUTF8(IDS_OPTIONS_PASSWORDS_ASKTOSAVE).c_str());
214 g_signal_connect(passwords_asktosave_radio_, "toggled", 214 g_signal_connect(passwords_asktosave_radio_, "toggled",
(...skipping 362 matching lines...) Expand 10 before | Expand all | Expand 10 after
577 if (response == GTK_RESPONSE_ACCEPT) { 577 if (response == GTK_RESPONSE_ACCEPT) {
578 sync_service_->DisableForUser(); 578 sync_service_->DisableForUser();
579 ProfileSyncService::SyncEvent(ProfileSyncService::STOP_FROM_OPTIONS); 579 ProfileSyncService::SyncEvent(ProfileSyncService::STOP_FROM_OPTIONS);
580 } 580 }
581 gtk_widget_destroy(widget); 581 gtk_widget_destroy(widget);
582 } 582 }
583 583
584 void ContentPageGtk::OnPrivacyDashboardLinkClicked(GtkWidget* widget) { 584 void ContentPageGtk::OnPrivacyDashboardLinkClicked(GtkWidget* widget) {
585 BrowserList::GetLastActive()->OpenPrivacyDashboardTabAndActivate(); 585 BrowserList::GetLastActive()->OpenPrivacyDashboardTabAndActivate();
586 } 586 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698