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

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

Issue 10447096: Fix webview example in views examples. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: cros clang fix. Created 8 years, 6 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 | « ash/test/ash_test_base.h ('k') | ui/views/test/test_views_delegate.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 <vector> 7 #include <vector>
8 8
9 #include "ash/shell.h" 9 #include "ash/shell.h"
10 #include "ash/test/test_shell_delegate.h" 10 #include "ash/test/test_shell_delegate.h"
11 #include "content/test/web_contents_tester.h"
11 #include "ui/aura/env.h" 12 #include "ui/aura/env.h"
12 #include "ui/aura/monitor_manager.h" 13 #include "ui/aura/monitor_manager.h"
13 #include "ui/aura/root_window.h" 14 #include "ui/aura/root_window.h"
14 #include "ui/compositor/layer_animator.h" 15 #include "ui/compositor/layer_animator.h"
15 #include "ui/gfx/monitor.h" 16 #include "ui/gfx/monitor.h"
16 #include "ui/gfx/screen.h" 17 #include "ui/gfx/screen.h"
17 18
18 namespace ash { 19 namespace ash {
19 namespace test { 20 namespace test {
20 21
22 content::WebContents* AshTestViewsDelegate::CreateWebContents(
23 content::BrowserContext* browser_context,
24 content::SiteInstance* site_instance) {
25 return content::WebContentsTester::CreateTestWebContents(browser_context,
26 site_instance);
27 }
28
21 AshTestBase::AshTestBase() { 29 AshTestBase::AshTestBase() {
22 } 30 }
23 31
24 AshTestBase::~AshTestBase() { 32 AshTestBase::~AshTestBase() {
25 } 33 }
26 34
27 void AshTestBase::SetUp() { 35 void AshTestBase::SetUp() {
28 // Creates Shell and hook with Desktop. 36 // Creates Shell and hook with Desktop.
29 TestShellDelegate* delegate = new TestShellDelegate; 37 TestShellDelegate* delegate = new TestShellDelegate;
30 ash::Shell::CreateInstance(delegate); 38 ash::Shell::CreateInstance(delegate);
(...skipping 25 matching lines...) Expand all
56 64
57 void AshTestBase::RunAllPendingInMessageLoop() { 65 void AshTestBase::RunAllPendingInMessageLoop() {
58 #if !defined(OS_MACOSX) 66 #if !defined(OS_MACOSX)
59 message_loop_.RunAllPendingWithDispatcher( 67 message_loop_.RunAllPendingWithDispatcher(
60 aura::Env::GetInstance()->GetDispatcher()); 68 aura::Env::GetInstance()->GetDispatcher());
61 #endif 69 #endif
62 } 70 }
63 71
64 } // namespace test 72 } // namespace test
65 } // namespace ash 73 } // namespace ash
OLDNEW
« no previous file with comments | « ash/test/ash_test_base.h ('k') | ui/views/test/test_views_delegate.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698