summaryrefslogtreecommitdiffstats
path: root/chrome/browser/gtk/browser_titlebar.cc
diff options
context:
space:
mode:
authorpkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-02-12 20:00:42 +0000
committerpkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-02-12 20:00:42 +0000
commit8d7727ac112e452b4daa1161d516401120475d68 (patch)
tree369c6692c3671851da87d99fb7dbbf964988ae58 /chrome/browser/gtk/browser_titlebar.cc
parent3e792af86043c1414149cd05488a2bebe787c767 (diff)
downloadchromium_src-8d7727ac112e452b4daa1161d516401120475d68.zip
chromium_src-8d7727ac112e452b4daa1161d516401120475d68.tar.gz
chromium_src-8d7727ac112e452b4daa1161d516401120475d68.tar.bz2
Remove "Glen" close button joke now that it's had a long and happy life.
String removal coming in a future patch. BUG=none TEST=none Review URL: http://codereview.chromium.org/600075 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@38924 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/gtk/browser_titlebar.cc')
-rw-r--r--chrome/browser/gtk/browser_titlebar.cc13
1 files changed, 4 insertions, 9 deletions
diff --git a/chrome/browser/gtk/browser_titlebar.cc b/chrome/browser/gtk/browser_titlebar.cc
index 8e8f69f..8047b60 100644
--- a/chrome/browser/gtk/browser_titlebar.cc
+++ b/chrome/browser/gtk/browser_titlebar.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -255,14 +255,9 @@ void BrowserTitlebar::Init() {
gtk_box_pack_start(GTK_BOX(titlebar_buttons_box_), buttons_hbox, FALSE,
FALSE, 0);
- if (CommandLine::ForCurrentProcess()->HasSwitch("glen")) {
- close_button_.reset(BuildTitlebarButton(IDR_GLEN, IDR_GLEN, IDR_GLEN,
- buttons_hbox, IDS_GLEN));
- } else {
- close_button_.reset(BuildTitlebarButton(IDR_CLOSE, IDR_CLOSE_P, IDR_CLOSE_H,
- buttons_hbox,
- IDS_XPFRAME_CLOSE_TOOLTIP));
- }
+ close_button_.reset(BuildTitlebarButton(IDR_CLOSE, IDR_CLOSE_P, IDR_CLOSE_H,
+ buttons_hbox,
+ IDS_XPFRAME_CLOSE_TOOLTIP));
restore_button_.reset(BuildTitlebarButton(IDR_RESTORE, IDR_RESTORE_P,
IDR_RESTORE_H, buttons_hbox,