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

Unified Diff: chrome/browser/gtk/gconf_titlebar_listener.cc

Issue 4691001: Make GConf dependency optional. (Closed)
Patch Set: Created 10 years, 1 month 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/gtk/browser_titlebar.cc ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/gtk/gconf_titlebar_listener.cc
diff --git a/chrome/browser/gtk/gconf_titlebar_listener.cc b/chrome/browser/gtk/gconf_titlebar_listener.cc
index 81b5ef0dae94f7dac32c4599028cbd2a1fc55394..237332fdbb4945720cc2e9cb7b618b34f109eed2 100644
--- a/chrome/browser/gtk/gconf_titlebar_listener.cc
+++ b/chrome/browser/gtk/gconf_titlebar_listener.cc
@@ -13,10 +13,6 @@
namespace {
-// A default button order string for when we aren't asking gconf for the
-// metacity configuration.
-const char* kDefaultButtonPlacement = ":minimize,maximize,close";
-
// The GConf key we read for the button placement string. Even through the key
// has "metacity" in it, it's shared between metacity and compiz.
const char* kButtonLayoutKey = "/apps/metacity/general/button_layout";
@@ -34,7 +30,7 @@ void GConfTitlebarListener::SetTitlebarButtons(BrowserTitlebar* titlebar) {
titlebar->BuildButtons(current_value_);
titlebars_.insert(titlebar);
} else {
- titlebar->BuildButtons(kDefaultButtonPlacement);
+ titlebar->BuildButtons(BrowserTitlebar::kDefaultButtonString);
}
}
@@ -113,8 +109,8 @@ bool GConfTitlebarListener::HandleGError(GError* error, const char* key) {
void GConfTitlebarListener::ParseAndStoreValue(GConfValue* gconf_value) {
if (gconf_value) {
const char* value = gconf_value_get_string(gconf_value);
- current_value_ = value ? value : kDefaultButtonPlacement;
+ current_value_ = value ? value : BrowserTitlebar::kDefaultButtonString;
} else {
- current_value_ = kDefaultButtonPlacement;
+ current_value_ = BrowserTitlebar::kDefaultButtonString;
}
}
« no previous file with comments | « chrome/browser/gtk/browser_titlebar.cc ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698