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

Side by Side Diff: chrome/test/base/browser_with_test_window_test.cc

Issue 8894018: Move the concept of Activation to the Shell. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 years 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 (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 #include "chrome/test/base/browser_with_test_window_test.h" 5 #include "chrome/test/base/browser_with_test_window_test.h"
6 6
7 #if defined(OS_WIN) 7 #if defined(OS_WIN)
8 #include <ole2.h> 8 #include <ole2.h>
9 #endif // defined(OS_WIN) 9 #endif // defined(OS_WIN)
10 10
(...skipping 10 matching lines...) Expand all
21 using content::BrowserThread; 21 using content::BrowserThread;
22 22
23 BrowserWithTestWindowTest::BrowserWithTestWindowTest() 23 BrowserWithTestWindowTest::BrowserWithTestWindowTest()
24 : ui_thread_(BrowserThread::UI, message_loop()), 24 : ui_thread_(BrowserThread::UI, message_loop()),
25 file_thread_(BrowserThread::FILE, message_loop()), 25 file_thread_(BrowserThread::FILE, message_loop()),
26 rph_factory_(), 26 rph_factory_(),
27 rvh_factory_(&rph_factory_) { 27 rvh_factory_(&rph_factory_) {
28 #if defined(OS_WIN) 28 #if defined(OS_WIN)
29 OleInitialize(NULL); 29 OleInitialize(NULL);
30 #endif 30 #endif
31 #if defined(USE_AURA)
32 test_activation_client_.reset(new aura::test::TestActivationClient);
33 #endif
31 } 34 }
32 35
33 void BrowserWithTestWindowTest::SetUp() { 36 void BrowserWithTestWindowTest::SetUp() {
34 testing::Test::SetUp(); 37 testing::Test::SetUp();
35 38
36 profile_.reset(CreateProfile()); 39 profile_.reset(CreateProfile());
37 browser_.reset(new Browser(Browser::TYPE_TABBED, profile())); 40 browser_.reset(new Browser(Browser::TYPE_TABBED, profile()));
38 window_.reset(new TestBrowserWindow(browser())); 41 window_.reset(new TestBrowserWindow(browser()));
39 browser_->set_window(window_.get()); 42 browser_->set_window(window_.get());
40 } 43 }
(...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after
130 // Make sure we close all tabs, otherwise Browser isn't happy in its 133 // Make sure we close all tabs, otherwise Browser isn't happy in its
131 // destructor. 134 // destructor.
132 browser()->CloseAllTabs(); 135 browser()->CloseAllTabs();
133 browser_.reset(NULL); 136 browser_.reset(NULL);
134 window_.reset(NULL); 137 window_.reset(NULL);
135 } 138 }
136 139
137 TestingProfile* BrowserWithTestWindowTest::CreateProfile() { 140 TestingProfile* BrowserWithTestWindowTest::CreateProfile() {
138 return new TestingProfile(); 141 return new TestingProfile();
139 } 142 }
OLDNEW
« no previous file with comments | « chrome/test/base/browser_with_test_window_test.h ('k') | content/browser/renderer_host/render_widget_host_view_aura.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698