ui/views/test/views_test_base.h - Issue 154203002: Remove unnecessary uses of aura::Env::GetDispatcher

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: ui/views/test/views_test_base.h

Issue 154203002: Remove unnecessary uses of aura::Env::GetDispatcher (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: . Created 6 years, 10 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

« no previous file with comments | « ui/views/focus/accelerator_handler_aura.cc ('k') | ui/views/test/views_test_base.cc » ('j') | no next file with comments »

OLD	NEW
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 #ifndef UI_VIEWS_TEST_VIEWS_TEST_BASE_H_	5 #ifndef UI_VIEWS_TEST_VIEWS_TEST_BASE_H_

6 #define UI_VIEWS_TEST_VIEWS_TEST_BASE_H_	6 #define UI_VIEWS_TEST_VIEWS_TEST_BASE_H_

7	7

8 #include "base/memory/scoped_ptr.h"	8 #include "base/memory/scoped_ptr.h"

9 #include "base/message_loop/message_loop.h"	9 #include "base/message_loop/message_loop.h"

10 #include "testing/gtest/include/gtest/gtest.h"	10 #include "testing/gtest/include/gtest/gtest.h"

(...skipping 37 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
48	48

49 base::MessageLoopForUI* message_loop() { return &message_loop_; }	49 base::MessageLoopForUI* message_loop() { return &message_loop_; }

50	50

51 // Returns a context view. In aura builds, this will be the	51 // Returns a context view. In aura builds, this will be the

52 // RootWindow. Everywhere else, NULL.	52 // RootWindow. Everywhere else, NULL.

53 gfx::NativeView GetContext();	53 gfx::NativeView GetContext();

54	54

55 private:	55 private:

56 base::MessageLoopForUI message_loop_;	56 base::MessageLoopForUI message_loop_;

57 scoped_ptr<TestViewsDelegate> views_delegate_;	57 scoped_ptr<TestViewsDelegate> views_delegate_;

58 #if defined(USE_AURA)

59 scoped_ptr<aura::test::AuraTestHelper> aura_test_helper_;	58 scoped_ptr<aura::test::AuraTestHelper> aura_test_helper_;

60 scoped_ptr<views::corewm::WMState> wm_state_;	59 scoped_ptr<views::corewm::WMState> wm_state_;

61 #endif

62 bool setup_called_;	60 bool setup_called_;

63 bool teardown_called_;	61 bool teardown_called_;

64	62

65 #if defined(OS_WIN)	63 #if defined(OS_WIN)

66 ui::ScopedOleInitializer ole_initializer_;	64 ui::ScopedOleInitializer ole_initializer_;

67 #endif	65 #endif

68	66

69 DISALLOW_COPY_AND_ASSIGN(ViewsTestBase);	67 DISALLOW_COPY_AND_ASSIGN(ViewsTestBase);

70 };	68 };

71	69

72 } // namespace views	70 } // namespace views

73	71

74 #endif // UI_VIEWS_TEST_VIEWS_TEST_BASE_H_	72 #endif // UI_VIEWS_TEST_VIEWS_TEST_BASE_H_

OLD	NEW