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

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

Issue 8642002: Enable FocusManager tests for Aura. (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 492 matching lines...) Expand 10 before | Expand all | Expand 10 after
503 cursor_ = cursor; 503 cursor_ = cursor;
504 aura::Desktop::GetInstance()->SetCursor(cursor); 504 aura::Desktop::GetInstance()->SetCursor(cursor);
505 } 505 }
506 506
507 void NativeWidgetAura::ClearNativeFocus() { 507 void NativeWidgetAura::ClearNativeFocus() {
508 if (window_ && window_->GetFocusManager()) 508 if (window_ && window_->GetFocusManager())
509 window_->GetFocusManager()->SetFocusedWindow(window_); 509 window_->GetFocusManager()->SetFocusedWindow(window_);
510 } 510 }
511 511
512 void NativeWidgetAura::FocusNativeView(gfx::NativeView native_view) { 512 void NativeWidgetAura::FocusNativeView(gfx::NativeView native_view) {
513 // http://crbug.com/102572 513 window_->GetFocusManager()->SetFocusedWindow(native_view);
514 NOTIMPLEMENTED();
515 } 514 }
516 515
517 gfx::Rect NativeWidgetAura::GetWorkAreaBoundsInScreen() const { 516 gfx::Rect NativeWidgetAura::GetWorkAreaBoundsInScreen() const {
518 return gfx::Screen::GetMonitorWorkAreaNearestWindow(GetNativeView()); 517 return gfx::Screen::GetMonitorWorkAreaNearestWindow(GetNativeView());
519 } 518 }
520 519
521 void NativeWidgetAura::SetInactiveRenderingDisabled(bool value) { 520 void NativeWidgetAura::SetInactiveRenderingDisabled(bool value) {
522 if (!value) 521 if (!value)
523 desktop_observer_.reset(); 522 desktop_observer_.reset();
524 else 523 else
(...skipping 254 matching lines...) Expand 10 before | Expand all | Expand 10 after
779 NOTIMPLEMENTED(); 778 NOTIMPLEMENTED();
780 } 779 }
781 780
782 // static 781 // static
783 bool NativeWidgetPrivate::IsMouseButtonDown() { 782 bool NativeWidgetPrivate::IsMouseButtonDown() {
784 return aura::Desktop::GetInstance()->IsMouseButtonDown(); 783 return aura::Desktop::GetInstance()->IsMouseButtonDown();
785 } 784 }
786 785
787 } // namespace internal 786 } // namespace internal
788 } // namespace views 787 } // namespace views
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698