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

Side by Side Diff: views/widget/native_widget_aura.cc

Issue 8571026: Fix fullscreen mode on aura (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: git-try -b win_aura,linux_aura,win,linux_chromeos Created 9 years, 1 month 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 | Annotate | Revision Log
« no previous file with comments | « chrome/test/base/in_process_browser_test.cc ('k') | no next file » | 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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 "views/widget/native_widget_aura.h" 5 #include "views/widget/native_widget_aura.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "ui/aura/client/aura_constants.h" 8 #include "ui/aura/client/aura_constants.h"
9 #include "ui/aura/desktop.h" 9 #include "ui/aura/desktop.h"
10 #include "ui/aura/desktop_observer.h" 10 #include "ui/aura/desktop_observer.h"
(...skipping 356 matching lines...) Expand 10 before | Expand all | Expand 10 after
367 void NativeWidgetAura::EnableClose(bool enable) { 367 void NativeWidgetAura::EnableClose(bool enable) {
368 // http://crbug.com/102581 368 // http://crbug.com/102581
369 NOTIMPLEMENTED(); 369 NOTIMPLEMENTED();
370 } 370 }
371 371
372 void NativeWidgetAura::Show() { 372 void NativeWidgetAura::Show() {
373 ShowWithWindowState(ui::SHOW_STATE_INACTIVE); 373 ShowWithWindowState(ui::SHOW_STATE_INACTIVE);
374 } 374 }
375 375
376 void NativeWidgetAura::Hide() { 376 void NativeWidgetAura::Hide() {
377 window_->Hide(); 377 // |window_| may already be deleted by parent window.
378 if (window_)
Ben Goodger (Google) 2011/11/16 15:48:25 This seems kind of random. What other functions in
oshima 2011/11/16 16:51:47 On second thought, I think I should move this to C
379 window_->Hide();
378 } 380 }
379 381
380 void NativeWidgetAura::ShowMaximizedWithBounds( 382 void NativeWidgetAura::ShowMaximizedWithBounds(
381 const gfx::Rect& restored_bounds) { 383 const gfx::Rect& restored_bounds) {
382 window_->SetBounds(restored_bounds); 384 window_->SetBounds(restored_bounds);
383 ShowWithWindowState(ui::SHOW_STATE_MAXIMIZED); 385 ShowWithWindowState(ui::SHOW_STATE_MAXIMIZED);
384 } 386 }
385 387
386 void NativeWidgetAura::ShowWithWindowState(ui::WindowShowState state) { 388 void NativeWidgetAura::ShowWithWindowState(ui::WindowShowState state) {
387 if (state == ui::SHOW_STATE_MAXIMIZED || 389 if (state == ui::SHOW_STATE_MAXIMIZED ||
(...skipping 334 matching lines...) Expand 10 before | Expand all | Expand 10 after
722 NOTIMPLEMENTED(); 724 NOTIMPLEMENTED();
723 } 725 }
724 726
725 // static 727 // static
726 bool NativeWidgetPrivate::IsMouseButtonDown() { 728 bool NativeWidgetPrivate::IsMouseButtonDown() {
727 return aura::Desktop::GetInstance()->IsMouseButtonDown(); 729 return aura::Desktop::GetInstance()->IsMouseButtonDown();
728 } 730 }
729 731
730 } // namespace internal 732 } // namespace internal
731 } // namespace views 733 } // namespace views
OLDNEW
« no previous file with comments | « chrome/test/base/in_process_browser_test.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698