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

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

Issue 10824200: Handful of tweaks for tab dragging with touch: (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix windows Created 8 years, 4 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 | « chrome/browser/ui/views/tabs/tab_strip.cc ('k') | ui/aura/test/event_generator.h » ('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 #ifndef CHROME_TEST_BASE_IN_PROCESS_BROWSER_TEST_H_ 5 #ifndef CHROME_TEST_BASE_IN_PROCESS_BROWSER_TEST_H_
6 #define CHROME_TEST_BASE_IN_PROCESS_BROWSER_TEST_H_ 6 #define CHROME_TEST_BASE_IN_PROCESS_BROWSER_TEST_H_
7 7
8 #include "base/compiler_specific.h" 8 #include "base/compiler_specific.h"
9 #include "base/memory/ref_counted.h" 9 #include "base/memory/ref_counted.h"
10 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
(...skipping 127 matching lines...) Expand 10 before | Expand all | Expand 10 after
138 138
139 // Creates a browser for an application and waits for it to load and shows 139 // Creates a browser for an application and waits for it to load and shows
140 // the browser. 140 // the browser.
141 Browser* CreateBrowserForApp(const std::string& app_name, Profile* profile); 141 Browser* CreateBrowserForApp(const std::string& app_name, Profile* profile);
142 142
143 // Called from the various CreateBrowser methods to add a blank tab, wait for 143 // Called from the various CreateBrowser methods to add a blank tab, wait for
144 // the navigation to complete, and show the browser's window. 144 // the navigation to complete, and show the browser's window.
145 void AddBlankTabAndShow(Browser* browser); 145 void AddBlankTabAndShow(Browser* browser);
146 146
147 #if !defined OS_MACOSX 147 #if !defined OS_MACOSX
148 // Return a CommandLine object that is used to relaunch the browser_test bina ry 148 // Return a CommandLine object that is used to relaunch the browser_test
149 // as a browser process. This function is deliberately not defined on the Mac 149 // binary as a browser process. This function is deliberately not defined on
150 // because re-using an existing browser process when launching from the comman d 150 // the Mac because re-using an existing browser process when launching from
151 // line isn't a concept that we support on the Mac; AppleEvents are the Mac 151 // the command line isn't a concept that we support on the Mac; AppleEvents
152 // solution for the same need. Any test based on these functions doesn't apply 152 // are the Mac solution for the same need. Any test based on these functions
153 // to the Mac. 153 // doesn't apply to the Mac.
154 CommandLine GetCommandLineForRelaunch(); 154 CommandLine GetCommandLineForRelaunch();
155 #endif 155 #endif
156 156
157 // Returns the host resolver being used for the tests. Subclasses might want 157 // Returns the host resolver being used for the tests. Subclasses might want
158 // to configure it inside tests. 158 // to configure it inside tests.
159 net::RuleBasedHostResolverProc* host_resolver() { 159 net::RuleBasedHostResolverProc* host_resolver() {
160 return host_resolver_.get(); 160 return host_resolver_.get();
161 } 161 }
162 162
163 #if defined(OS_POSIX) 163 #if defined(OS_POSIX)
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
196 // Host resolver to use during the test. 196 // Host resolver to use during the test.
197 scoped_refptr<net::RuleBasedHostResolverProc> host_resolver_; 197 scoped_refptr<net::RuleBasedHostResolverProc> host_resolver_;
198 198
199 // Temporary user data directory. Used only when a user data directory is not 199 // Temporary user data directory. Used only when a user data directory is not
200 // specified in the command line. 200 // specified in the command line.
201 ScopedTempDir temp_user_data_dir_; 201 ScopedTempDir temp_user_data_dir_;
202 202
203 #if defined(OS_POSIX) 203 #if defined(OS_POSIX)
204 bool handle_sigterm_; 204 bool handle_sigterm_;
205 #endif 205 #endif
206 206
207 #if defined(OS_CHROMEOS) 207 #if defined(OS_CHROMEOS)
208 chromeos::ScopedStubCrosEnabler stub_cros_enabler_; 208 chromeos::ScopedStubCrosEnabler stub_cros_enabler_;
209 #endif // defined(OS_CHROMEOS) 209 #endif // defined(OS_CHROMEOS)
210 210
211 #if defined(OS_MACOSX) 211 #if defined(OS_MACOSX)
212 base::mac::ScopedNSAutoreleasePool* autorelease_pool_; 212 base::mac::ScopedNSAutoreleasePool* autorelease_pool_;
213 #endif // OS_MACOSX 213 #endif // OS_MACOSX
214 }; 214 };
215 215
216 #endif // CHROME_TEST_BASE_IN_PROCESS_BROWSER_TEST_H_ 216 #endif // CHROME_TEST_BASE_IN_PROCESS_BROWSER_TEST_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/tabs/tab_strip.cc ('k') | ui/aura/test/event_generator.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698