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

Side by Side Diff: ash/test/ash_test_base.cc

Issue 11183026: Fix type /Initilaize/Initialize/ (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 2 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 | « no previous file | chrome/test/base/view_event_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) 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 #include "ash/test/ash_test_base.h" 5 #include "ash/test/ash_test_base.h"
6 6
7 #include <string> 7 #include <string>
8 #include <vector> 8 #include <vector>
9 9
10 #include "ash/display/display_controller.h" 10 #include "ash/display/display_controller.h"
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
49 49
50 AshTestBase::AshTestBase() { 50 AshTestBase::AshTestBase() {
51 } 51 }
52 52
53 AshTestBase::~AshTestBase() { 53 AshTestBase::~AshTestBase() {
54 } 54 }
55 55
56 void AshTestBase::SetUp() { 56 void AshTestBase::SetUp() {
57 // Disable animations during tests. 57 // Disable animations during tests.
58 ui::LayerAnimator::set_disable_animations_for_test(true); 58 ui::LayerAnimator::set_disable_animations_for_test(true);
59 ui::TextInputTestSupport::Initilaize(); 59 ui::TextInputTestSupport::Initialize();
60 // Creates Shell and hook with Desktop. 60 // Creates Shell and hook with Desktop.
61 TestShellDelegate* delegate = new TestShellDelegate; 61 TestShellDelegate* delegate = new TestShellDelegate;
62 ash::Shell::CreateInstance(delegate); 62 ash::Shell::CreateInstance(delegate);
63 Shell::GetPrimaryRootWindow()->Show(); 63 Shell::GetPrimaryRootWindow()->Show();
64 // Move the mouse cursor to far away so that native events doesn't 64 // Move the mouse cursor to far away so that native events doesn't
65 // interfere test expectations. 65 // interfere test expectations.
66 Shell::GetPrimaryRootWindow()->MoveCursorTo(gfx::Point(-1000, -1000)); 66 Shell::GetPrimaryRootWindow()->MoveCursorTo(gfx::Point(-1000, -1000));
67 UpdateDisplay("800x600"); 67 UpdateDisplay("800x600");
68 Shell::GetInstance()->cursor_manager()->ShowCursor(true); 68 Shell::GetInstance()->cursor_manager()->ShowCursor(true);
69 } 69 }
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
123 void AshTestBase::RunAllPendingInMessageLoop() { 123 void AshTestBase::RunAllPendingInMessageLoop() {
124 #if !defined(OS_MACOSX) 124 #if !defined(OS_MACOSX)
125 DCHECK(MessageLoopForUI::current() == &message_loop_); 125 DCHECK(MessageLoopForUI::current() == &message_loop_);
126 base::RunLoop run_loop(aura::Env::GetInstance()->GetDispatcher()); 126 base::RunLoop run_loop(aura::Env::GetInstance()->GetDispatcher());
127 run_loop.RunUntilIdle(); 127 run_loop.RunUntilIdle();
128 #endif 128 #endif
129 } 129 }
130 130
131 } // namespace test 131 } // namespace test
132 } // namespace ash 132 } // namespace ash
OLDNEW
« no previous file with comments | « no previous file | chrome/test/base/view_event_test_base.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698