Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(10)

Side by Side Diff: ui/views/widget/desktop_aura/desktop_native_widget_aura.cc

Issue 13849012: We need to call aura::Window::Show from the DesktopNativeWidgetAura::ShowMaximizedWithBounds and Sh… (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 7 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | ui/views/widget/widget_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ui/views/widget/desktop_aura/desktop_native_widget_aura.h" 5 #include "ui/views/widget/desktop_aura/desktop_native_widget_aura.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "ui/aura/client/activation_client.h" 8 #include "ui/aura/client/activation_client.h"
9 #include "ui/aura/client/aura_constants.h" 9 #include "ui/aura/client/aura_constants.h"
10 #include "ui/aura/client/stacking_client.h" 10 #include "ui/aura/client/stacking_client.h"
(...skipping 427 matching lines...) Expand 10 before | Expand all | Expand 10 after
438 438
439 void DesktopNativeWidgetAura::Hide() { 439 void DesktopNativeWidgetAura::Hide() {
440 desktop_root_window_host_->AsRootWindowHost()->Hide(); 440 desktop_root_window_host_->AsRootWindowHost()->Hide();
441 if (window_) 441 if (window_)
442 window_->Hide(); 442 window_->Hide();
443 } 443 }
444 444
445 void DesktopNativeWidgetAura::ShowMaximizedWithBounds( 445 void DesktopNativeWidgetAura::ShowMaximizedWithBounds(
446 const gfx::Rect& restored_bounds) { 446 const gfx::Rect& restored_bounds) {
447 desktop_root_window_host_->ShowMaximizedWithBounds(restored_bounds); 447 desktop_root_window_host_->ShowMaximizedWithBounds(restored_bounds);
448 window_->Show();
448 } 449 }
449 450
450 void DesktopNativeWidgetAura::ShowWithWindowState(ui::WindowShowState state) { 451 void DesktopNativeWidgetAura::ShowWithWindowState(ui::WindowShowState state) {
451 desktop_root_window_host_->ShowWindowWithState(state); 452 desktop_root_window_host_->ShowWindowWithState(state);
453 window_->Show();
452 } 454 }
453 455
454 bool DesktopNativeWidgetAura::IsVisible() const { 456 bool DesktopNativeWidgetAura::IsVisible() const {
455 return desktop_root_window_host_->IsVisible(); 457 return desktop_root_window_host_->IsVisible();
456 } 458 }
457 459
458 void DesktopNativeWidgetAura::Activate() { 460 void DesktopNativeWidgetAura::Activate() {
459 desktop_root_window_host_->Activate(); 461 desktop_root_window_host_->Activate();
460 } 462 }
461 463
(...skipping 356 matching lines...) Expand 10 before | Expand all | Expand 10 after
818 drop_helper_->OnDragExit(); 820 drop_helper_->OnDragExit();
819 } 821 }
820 822
821 int DesktopNativeWidgetAura::OnPerformDrop(const ui::DropTargetEvent& event) { 823 int DesktopNativeWidgetAura::OnPerformDrop(const ui::DropTargetEvent& event) {
822 DCHECK(drop_helper_.get() != NULL); 824 DCHECK(drop_helper_.get() != NULL);
823 return drop_helper_->OnDrop(event.data(), event.location(), 825 return drop_helper_->OnDrop(event.data(), event.location(),
824 last_drop_operation_); 826 last_drop_operation_);
825 } 827 }
826 828
827 } // namespace views 829 } // namespace views
OLDNEW
« no previous file with comments | « no previous file | ui/views/widget/widget_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698