| 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;
|
| }
|
| }
|
|
|