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

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

Issue 8869005: Revert EnableClose() removal and related crash fixes. I don't understand the crashes here, and th... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years 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
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 "ui/views/widget/native_widget_aura.h" 5 #include "ui/views/widget/native_widget_aura.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/string_util.h" 8 #include "base/string_util.h"
9 #include "ui/aura/client/aura_constants.h" 9 #include "ui/aura/client/aura_constants.h"
10 #include "ui/aura/client/drag_drop_client.h" 10 #include "ui/aura/client/drag_drop_client.h"
(...skipping 373 matching lines...) Expand 10 before | Expand all | Expand 10 after
384 FROM_HERE, 384 FROM_HERE,
385 base::Bind(&NativeWidgetAura::CloseNow, 385 base::Bind(&NativeWidgetAura::CloseNow,
386 close_widget_factory_.GetWeakPtr())); 386 close_widget_factory_.GetWeakPtr()));
387 } 387 }
388 } 388 }
389 389
390 void NativeWidgetAura::CloseNow() { 390 void NativeWidgetAura::CloseNow() {
391 delete window_; 391 delete window_;
392 } 392 }
393 393
394 void NativeWidgetAura::EnableClose(bool enable) {
395 // http://crbug.com/102581
396 NOTIMPLEMENTED();
397 }
398
394 void NativeWidgetAura::Show() { 399 void NativeWidgetAura::Show() {
395 ShowWithWindowState(ui::SHOW_STATE_INACTIVE); 400 ShowWithWindowState(ui::SHOW_STATE_INACTIVE);
396 } 401 }
397 402
398 void NativeWidgetAura::Hide() { 403 void NativeWidgetAura::Hide() {
399 window_->Hide(); 404 window_->Hide();
400 } 405 }
401 406
402 void NativeWidgetAura::ShowMaximizedWithBounds( 407 void NativeWidgetAura::ShowMaximizedWithBounds(
403 const gfx::Rect& restored_bounds) { 408 const gfx::Rect& restored_bounds) {
(...skipping 387 matching lines...) Expand 10 before | Expand all | Expand 10 after
791 } 796 }
792 } 797 }
793 798
794 // static 799 // static
795 bool NativeWidgetPrivate::IsMouseButtonDown() { 800 bool NativeWidgetPrivate::IsMouseButtonDown() {
796 return aura::RootWindow::GetInstance()->IsMouseButtonDown(); 801 return aura::RootWindow::GetInstance()->IsMouseButtonDown();
797 } 802 }
798 803
799 } // namespace internal 804 } // namespace internal
800 } // namespace views 805 } // namespace views
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698