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

Side by Side Diff: ui/views/test/views_test_helper_aura.cc

Issue 387993004: MacViews: Change Widget context type to NativeWindow (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 5 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 | Annotate | Revision Log
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/test/views_test_helper_aura.h" 5 #include "ui/views/test/views_test_helper_aura.h"
6 6
7 #include "ui/aura/test/aura_test_helper.h" 7 #include "ui/aura/test/aura_test_helper.h"
8 #include "ui/wm/core/capture_controller.h" 8 #include "ui/wm/core/capture_controller.h"
9 #include "ui/wm/core/default_activation_client.h" 9 #include "ui/wm/core/default_activation_client.h"
10 #include "ui/wm/core/wm_state.h" 10 #include "ui/wm/core/wm_state.h"
(...skipping 20 matching lines...) Expand all
31 new wm::DefaultActivationClient(aura_test_helper_->root_window()); 31 new wm::DefaultActivationClient(aura_test_helper_->root_window());
32 wm_state_.reset(new wm::WMState); 32 wm_state_.reset(new wm::WMState);
33 } 33 }
34 34
35 void ViewsTestHelperAura::TearDown() { 35 void ViewsTestHelperAura::TearDown() {
36 aura_test_helper_->TearDown(); 36 aura_test_helper_->TearDown();
37 wm_state_.reset(); 37 wm_state_.reset();
38 CHECK(!wm::ScopedCaptureClient::IsActive()); 38 CHECK(!wm::ScopedCaptureClient::IsActive());
39 } 39 }
40 40
41 gfx::NativeView ViewsTestHelperAura::GetContext() { 41 gfx::NativeWindow ViewsTestHelperAura::GetContext() {
42 return aura_test_helper_->root_window(); 42 return aura_test_helper_->root_window();
43 } 43 }
44 44
45 } // namespace views 45 } // namespace views
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698