diff options
| author | pkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-12 20:00:42 +0000 |
|---|---|---|
| committer | pkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-12 20:00:42 +0000 |
| commit | 8d7727ac112e452b4daa1161d516401120475d68 (patch) | |
| tree | 369c6692c3671851da87d99fb7dbbf964988ae58 | |
| parent | 3e792af86043c1414149cd05488a2bebe787c767 (diff) | |
| download | chromium_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
| -rw-r--r-- | app/resources/app_resources.grd | 2 | ||||
| -rw-r--r-- | app/resources/linux_close_glen.png | bin | 2427 -> 0 bytes | |||
| -rw-r--r-- | chrome/browser/gtk/browser_titlebar.cc | 13 |
3 files changed, 4 insertions, 11 deletions
diff --git a/app/resources/app_resources.grd b/app/resources/app_resources.grd index c73c82ab..d4a7d5e 100644 --- a/app/resources/app_resources.grd +++ b/app/resources/app_resources.grd @@ -121,8 +121,6 @@ <include name="IDR_BROWSER_ACTION_BADGE_RIGHT" file="browser_action_badge_right.png" type="BINDATA" /> <include name="IDR_BROWSER_ACTION_BADGE_CENTER" file="browser_action_badge_center.png" type="BINDATA" /> - <include name="IDR_GLEN" file="linux_close_glen.png" type="BINDATA" /> - <!-- Infobar Buttons normal, highlighted and pushed images --> <include name="IDR_INFOBARBUTTON_TOP_LEFT_N" file="infobarbutton_tl_n.png" type="BINDATA" /> <include name="IDR_INFOBARBUTTON_TOP_N" file="infobarbutton_t_n.png" type="BINDATA" /> diff --git a/app/resources/linux_close_glen.png b/app/resources/linux_close_glen.png Binary files differdeleted file mode 100644 index 26e8d81..0000000 --- a/app/resources/linux_close_glen.png +++ /dev/null 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, |
