diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-30 18:30:17 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-30 18:30:17 +0000 |
| commit | a3929aba645d5ddcc04f542d0fac35f8680339a5 (patch) | |
| tree | 2736f45517be63c225c0fe897b4e75105307f83d /views | |
| parent | 6d742cebae15109031236a0ab0e286a72ca16be9 (diff) | |
| download | chromium_src-a3929aba645d5ddcc04f542d0fac35f8680339a5.zip chromium_src-a3929aba645d5ddcc04f542d0fac35f8680339a5.tar.gz chromium_src-a3929aba645d5ddcc04f542d0fac35f8680339a5.tar.bz2 | |
Change Window visibility to a simple boolean for now.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/8082017
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@103508 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views')
| -rw-r--r-- | views/aura_desktop/aura_desktop_main.cc | 6 | ||||
| -rw-r--r-- | views/widget/native_widget_aura.cc | 10 |
2 files changed, 8 insertions, 8 deletions
diff --git a/views/aura_desktop/aura_desktop_main.cc b/views/aura_desktop/aura_desktop_main.cc index 037be2f..0f8bc56 100644 --- a/views/aura_desktop/aura_desktop_main.cc +++ b/views/aura_desktop/aura_desktop_main.cc @@ -147,7 +147,7 @@ int main(int argc, char** argv) { window1->set_id(1); window1->Init(); window1->SetBounds(gfx::Rect(100, 100, 400, 400)); - window1->SetVisibility(aura::Window::VISIBILITY_SHOWN); + window1->Show(); window1->SetParent(NULL); DemoWindowDelegate window_delegate2(SK_ColorRED); @@ -155,7 +155,7 @@ int main(int argc, char** argv) { window2->set_id(2); window2->Init(); window2->SetBounds(gfx::Rect(200, 200, 350, 350)); - window2->SetVisibility(aura::Window::VISIBILITY_SHOWN); + window2->Show(); window2->SetParent(NULL); DemoWindowDelegate window_delegate3(SK_ColorGREEN); @@ -163,7 +163,7 @@ int main(int argc, char** argv) { window3->set_id(3); window3->Init(); window3->SetBounds(gfx::Rect(10, 10, 50, 50)); - window3->SetVisibility(aura::Window::VISIBILITY_SHOWN); + window3->Show(); window3->SetParent(window2); views::Widget* widget = new views::Widget; diff --git a/views/widget/native_widget_aura.cc b/views/widget/native_widget_aura.cc index 1d9155c..1545de6 100644 --- a/views/widget/native_widget_aura.cc +++ b/views/widget/native_widget_aura.cc @@ -63,7 +63,7 @@ void NativeWidgetAura::InitNativeWidget(const Widget::InitParams& params) { window_->SetParent(params.parent); // TODO(beng): do this some other way. delegate_->OnNativeWidgetSizeChanged(params.bounds.size()); - window_->SetVisibility(aura::Window::VISIBILITY_SHOWN); + window_->Show(); can_activate_ = params.can_activate; } @@ -264,11 +264,11 @@ void NativeWidgetAura::EnableClose(bool enable) { } void NativeWidgetAura::Show() { - window_->SetVisibility(aura::Window::VISIBILITY_SHOWN); + window_->Show(); } void NativeWidgetAura::Hide() { - window_->SetVisibility(aura::Window::VISIBILITY_HIDDEN); + window_->Hide(); } void NativeWidgetAura::ShowMaximizedWithBounds( @@ -277,12 +277,12 @@ void NativeWidgetAura::ShowMaximizedWithBounds( } void NativeWidgetAura::ShowWithWindowState(ui::WindowShowState state) { - window_->SetVisibility(aura::Window::VISIBILITY_SHOWN); + window_->Show(); NOTIMPLEMENTED(); } bool NativeWidgetAura::IsVisible() const { - return window_->visibility() != aura::Window::VISIBILITY_HIDDEN; + return window_->visible(); } void NativeWidgetAura::Activate() { |