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

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

Issue 8576005: IME (input method editor) support for Aura, part 3 of 3: Use ui::InputMethod in ash. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: move to ash/ime/ Created 8 years, 12 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/ui.gyp ('k') | ui/views/test/views_test_base.cc » ('j') | 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 #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 #pragma once 7 #pragma once
8 8
9 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 #include "base/message_loop.h" 10 #include "base/message_loop.h"
11 #include "testing/gtest/include/gtest/gtest.h" 11 #include "testing/gtest/include/gtest/gtest.h"
12 #include "ui/views/test/test_views_delegate.h" 12 #include "ui/views/test/test_views_delegate.h"
13 13
14 namespace aura { 14 namespace aura {
15 namespace test { 15 namespace test {
16 class TestActivationClient; 16 class TestActivationClient;
17 } 17 }
18 } 18 }
19 19
20 namespace ui {
21 class InputMethod;
22 }
23
20 namespace views { 24 namespace views {
21 25
22 class TestViewsDelegate; 26 class TestViewsDelegate;
23 27
24 // A base class for views unit test. It creates a message loop necessary 28 // A base class for views unit test. It creates a message loop necessary
25 // to drive UI events and takes care of OLE initialization for windows. 29 // to drive UI events and takes care of OLE initialization for windows.
26 class ViewsTestBase : public testing::Test { 30 class ViewsTestBase : public testing::Test {
27 public: 31 public:
28 ViewsTestBase(); 32 ViewsTestBase();
29 virtual ~ViewsTestBase(); 33 virtual ~ViewsTestBase();
(...skipping 11 matching lines...) Expand all
41 views_delegate_.reset(views_delegate); 45 views_delegate_.reset(views_delegate);
42 } 46 }
43 47
44 MessageLoop* message_loop() { return &message_loop_; } 48 MessageLoop* message_loop() { return &message_loop_; }
45 49
46 private: 50 private:
47 MessageLoopForUI message_loop_; 51 MessageLoopForUI message_loop_;
48 scoped_ptr<TestViewsDelegate> views_delegate_; 52 scoped_ptr<TestViewsDelegate> views_delegate_;
49 #if defined(USE_AURA) 53 #if defined(USE_AURA)
50 scoped_ptr<aura::test::TestActivationClient> test_activation_client_; 54 scoped_ptr<aura::test::TestActivationClient> test_activation_client_;
55 scoped_ptr<ui::InputMethod> test_input_method_;
51 #endif 56 #endif
52 bool setup_called_; 57 bool setup_called_;
53 bool teardown_called_; 58 bool teardown_called_;
54 59
55 DISALLOW_COPY_AND_ASSIGN(ViewsTestBase); 60 DISALLOW_COPY_AND_ASSIGN(ViewsTestBase);
56 }; 61 };
57 62
58 } // namespace views 63 } // namespace views
59 64
60 #endif // UI_VIEWS_TEST_VIEWS_TEST_BASE_H_ 65 #endif // UI_VIEWS_TEST_VIEWS_TEST_BASE_H_
OLDNEW
« no previous file with comments | « ui/ui.gyp ('k') | ui/views/test/views_test_base.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698