summaryrefslogtreecommitdiffstats
path: root/views/window
diff options
context:
space:
mode:
authorsky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-08-26 20:12:59 +0000
committersky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-08-26 20:12:59 +0000
commit345dd30a55dd5219c39a31df9621e715a8947924 (patch)
tree3562329aa4aac7361ff092ffb4976d28c59944a1 /views/window
parentf278f74b49f068b3bc1de49a0d90b33cb0d5c005 (diff)
downloadchromium_src-345dd30a55dd5219c39a31df9621e715a8947924.zip
chromium_src-345dd30a55dd5219c39a31df9621e715a8947924.tar.gz
chromium_src-345dd30a55dd5219c39a31df9621e715a8947924.tar.bz2
Reverts menu patch.
BUG=none TEST=none TBR=ben@chromium.org Review URL: http://codereview.chromium.org/173508 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@24509 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/window')
-rw-r--r--views/window/custom_frame_view.cc2
-rw-r--r--views/window/window_gtk.cc2
2 files changed, 3 insertions, 1 deletions
diff --git a/views/window/custom_frame_view.cc b/views/window/custom_frame_view.cc
index 3434485..8f0999b 100644
--- a/views/window/custom_frame_view.cc
+++ b/views/window/custom_frame_view.cc
@@ -514,6 +514,7 @@ void CustomFrameView::LayoutWindowControls() {
pushed_part = IDR_CLOSE_SA_P;
}
+ /*
ResourceBundle& rb = ResourceBundle::GetSharedInstance();
close_button_->SetImage(CustomButton::BS_NORMAL,
@@ -522,6 +523,7 @@ void CustomFrameView::LayoutWindowControls() {
rb.GetBitmapNamed(hot_part));
close_button_->SetImage(CustomButton::BS_PUSHED,
rb.GetBitmapNamed(pushed_part));
+ */
}
void CustomFrameView::LayoutTitleBar() {
diff --git a/views/window/window_gtk.cc b/views/window/window_gtk.cc
index b21d4dd..1643e1b 100644
--- a/views/window/window_gtk.cc
+++ b/views/window/window_gtk.cc
@@ -115,7 +115,7 @@ void WindowGtk::Show() {
}
void WindowGtk::HideWindow() {
- Hide();
+ NOTIMPLEMENTED();
}
void WindowGtk::PushForceHidden() {