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

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

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 #ifndef CHROME_TEST_BASE_BROWSER_WITH_TEST_WINDOW_TEST_H_ 5 #ifndef CHROME_TEST_BASE_BROWSER_WITH_TEST_WINDOW_TEST_H_
6 #define CHROME_TEST_BASE_BROWSER_WITH_TEST_WINDOW_TEST_H_ 6 #define CHROME_TEST_BASE_BROWSER_WITH_TEST_WINDOW_TEST_H_
7 #pragma once 7 #pragma once
8 8
9 #include "base/message_loop.h" 9 #include "base/message_loop.h"
10 #include "chrome/browser/ui/browser.h" 10 #include "chrome/browser/ui/browser.h"
11 #include "chrome/test/base/test_browser_window.h" 11 #include "chrome/test/base/test_browser_window.h"
12 #include "chrome/test/base/testing_profile.h" 12 #include "chrome/test/base/testing_profile.h"
13 #include "content/browser/renderer_host/test_render_view_host.h" 13 #include "content/browser/renderer_host/test_render_view_host.h"
14 #include "content/test/test_browser_thread.h" 14 #include "content/test/test_browser_thread.h"
15 #include "testing/gtest/include/gtest/gtest.h" 15 #include "testing/gtest/include/gtest/gtest.h"
16 16
17 #if defined(USE_AURA)
18 #include "ui/aura/test/test_activation_client.h"
19 #endif
20
21 #if defined(USE_AURA)
22 namespace aura {
23 namespace test {
24 class TestActivationClient;
25 }
26 }
27 #endif
28
17 class GURL; 29 class GURL;
18 class NavigationController; 30 class NavigationController;
19 31
20 // Base class for browser based unit tests. BrowserWithTestWindowTest creates a 32 // Base class for browser based unit tests. BrowserWithTestWindowTest creates a
21 // Browser with a TestingProfile and TestBrowserWindow. To add a tab use 33 // Browser with a TestingProfile and TestBrowserWindow. To add a tab use
22 // AddTab. For example, the following adds a tab and navigates to 34 // AddTab. For example, the following adds a tab and navigates to
23 // two URLs that target the TestTabContents: 35 // two URLs that target the TestTabContents:
24 // 36 //
25 // // Add a new tab and navigate it. This will be at index 0. 37 // // Add a new tab and navigate it. This will be at index 0.
26 // AddTab(browser(), GURL("http://foo/1")); 38 // AddTab(browser(), GURL("http://foo/1"));
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
100 content::TestBrowserThread ui_thread_; 112 content::TestBrowserThread ui_thread_;
101 content::TestBrowserThread file_thread_; 113 content::TestBrowserThread file_thread_;
102 114
103 scoped_ptr<TestingProfile> profile_; 115 scoped_ptr<TestingProfile> profile_;
104 scoped_ptr<TestBrowserWindow> window_; 116 scoped_ptr<TestBrowserWindow> window_;
105 scoped_ptr<Browser> browser_; 117 scoped_ptr<Browser> browser_;
106 118
107 MockRenderProcessHostFactory rph_factory_; 119 MockRenderProcessHostFactory rph_factory_;
108 TestRenderViewHostFactory rvh_factory_; 120 TestRenderViewHostFactory rvh_factory_;
109 121
122 #if defined(USE_AURA)
123 scoped_ptr<aura::test::TestActivationClient> test_activation_client_;
124 #endif
125
110 DISALLOW_COPY_AND_ASSIGN(BrowserWithTestWindowTest); 126 DISALLOW_COPY_AND_ASSIGN(BrowserWithTestWindowTest);
111 }; 127 };
112 128
113 #endif // CHROME_TEST_BASE_BROWSER_WITH_TEST_WINDOW_TEST_H_ 129 #endif // CHROME_TEST_BASE_BROWSER_WITH_TEST_WINDOW_TEST_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/aura/chrome_shell_delegate.cc ('k') | chrome/test/base/browser_with_test_window_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698