diff options
author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-22 03:47:31 +0000 |
---|---|---|
committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-22 03:47:31 +0000 |
commit | 66d22164c2aded1403643b52a9763f492acbbdcc (patch) | |
tree | 17f103ef313956ce3d6039663701fb52358df6cc /ui/aura_shell | |
parent | b233717168b03e58e2110897e96686ce7ea501f4 (diff) | |
download | chromium_src-66d22164c2aded1403643b52a9763f492acbbdcc.zip chromium_src-66d22164c2aded1403643b52a9763f492acbbdcc.tar.gz chromium_src-66d22164c2aded1403643b52a9763f492acbbdcc.tar.bz2 |
Get rid of the EnableClose() infrastructure in Widget.
Only one place was left using it (FirstRunSearchEngineView), and Brian said that didn't need to use it if it would just pick the first of the engine choices (prior to randomization) as the window was closed.
http://crbug.com/102581
TEST=unittests, and: run organic first run chrome, close the search engine selector, the Google should be the default. run organic first run Chrome, choose a non-Google engine, it should be the default.
Review URL: http://codereview.chromium.org/8618001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@111096 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/aura_shell')
-rw-r--r-- | ui/aura_shell/toplevel_frame_view.cc | 9 | ||||
-rw-r--r-- | ui/aura_shell/toplevel_frame_view.h | 1 |
2 files changed, 0 insertions, 10 deletions
diff --git a/ui/aura_shell/toplevel_frame_view.cc b/ui/aura_shell/toplevel_frame_view.cc index ab891a6..b1c06da 100644 --- a/ui/aura_shell/toplevel_frame_view.cc +++ b/ui/aura_shell/toplevel_frame_view.cc @@ -161,11 +161,6 @@ class WindowCaption : public FrameComponent, return HTNOWHERE; } - // Updates the enabled state of the close button. - void EnableClose(bool enable) { - close_button_->SetEnabled(enable); - } - // Overridden from FrameComponent: virtual bool IgnoreEventsForPoint(const gfx::Point& point) OVERRIDE { gfx::Point translated_point(point); @@ -401,10 +396,6 @@ void ToplevelFrameView::GetWindowMask(const gfx::Size& size, // Nothing. } -void ToplevelFrameView::EnableClose(bool enable) { - caption_->EnableClose(enable); -} - void ToplevelFrameView::ResetWindowControls() { NOTIMPLEMENTED(); } diff --git a/ui/aura_shell/toplevel_frame_view.h b/ui/aura_shell/toplevel_frame_view.h index cae7d8f..69af2be 100644 --- a/ui/aura_shell/toplevel_frame_view.h +++ b/ui/aura_shell/toplevel_frame_view.h @@ -56,7 +56,6 @@ class AURA_SHELL_EXPORT ToplevelFrameView : public views::NonClientFrameView { virtual int NonClientHitTest(const gfx::Point& point) OVERRIDE; virtual void GetWindowMask(const gfx::Size& size, gfx::Path* window_mask) OVERRIDE; - virtual void EnableClose(bool enable) OVERRIDE; virtual void ResetWindowControls() OVERRIDE; virtual void UpdateWindowIcon() OVERRIDE; |