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

Side by Side Diff: webkit/tools/test_shell/test_shell.h

Issue 193072: Move StringPiece into the base namespace. It is colliding (Closed)
Patch Set: take 2 Created 11 years, 3 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
« no previous file with comments | « webkit/glue/webkitclient_impl.cc ('k') | webkit/tools/test_shell/test_shell_gtk.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 /* 1 /*
2 * Copyright (C) 2006 Apple Computer, Inc. All rights reserved. 2 * Copyright (C) 2006 Apple Computer, Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 29 matching lines...) Expand all
40 #include "webkit/tools/test_shell/event_sending_controller.h" 40 #include "webkit/tools/test_shell/event_sending_controller.h"
41 #include "webkit/tools/test_shell/layout_test_controller.h" 41 #include "webkit/tools/test_shell/layout_test_controller.h"
42 #include "webkit/tools/test_shell/text_input_controller.h" 42 #include "webkit/tools/test_shell/text_input_controller.h"
43 #include "webkit/tools/test_shell/test_webview_delegate.h" 43 #include "webkit/tools/test_shell/test_webview_delegate.h"
44 #include "webkit/tools/test_shell/webview_host.h" 44 #include "webkit/tools/test_shell/webview_host.h"
45 #include "webkit/tools/test_shell/webwidget_host.h" 45 #include "webkit/tools/test_shell/webwidget_host.h"
46 46
47 typedef std::list<gfx::NativeWindow> WindowList; 47 typedef std::list<gfx::NativeWindow> WindowList;
48 48
49 struct WebPreferences; 49 struct WebPreferences;
50 class StringPiece;
51 class TestNavigationEntry; 50 class TestNavigationEntry;
52 class TestNavigationController; 51 class TestNavigationController;
53 52
53 namespace base {
54 class StringPiece;
55 }
56
54 class TestShell { 57 class TestShell {
55 public: 58 public:
56 struct TestParams { 59 struct TestParams {
57 // Load the test defaults. 60 // Load the test defaults.
58 TestParams() : dump_tree(true), dump_pixels(false) { 61 TestParams() : dump_tree(true), dump_pixels(false) {
59 } 62 }
60 63
61 // The kind of output we want from this test. 64 // The kind of output we want from this test.
62 bool dump_tree; 65 bool dump_tree;
63 bool dump_pixels; 66 bool dump_pixels;
(...skipping 197 matching lines...) Expand 10 before | Expand all | Expand 10 after
261 264
262 #if defined(OS_MACOSX) 265 #if defined(OS_MACOSX)
263 // handle cleaning up a shell given the associated window 266 // handle cleaning up a shell given the associated window
264 static void DestroyAssociatedShell(gfx::NativeWindow handle); 267 static void DestroyAssociatedShell(gfx::NativeWindow handle);
265 #endif 268 #endif
266 269
267 // Show the "attach to me" dialog, for debugging test shell startup. 270 // Show the "attach to me" dialog, for debugging test shell startup.
268 static void ShowStartupDebuggingDialog(); 271 static void ShowStartupDebuggingDialog();
269 272
270 // This is called indirectly by the network layer to access resources. 273 // This is called indirectly by the network layer to access resources.
271 static StringPiece NetResourceProvider(int key); 274 static base::StringPiece NetResourceProvider(int key);
272 275
273 protected: 276 protected:
274 bool Initialize(const GURL& starting_url); 277 bool Initialize(const GURL& starting_url);
275 bool IsSVGTestURL(const GURL& url); 278 bool IsSVGTestURL(const GURL& url);
276 void SizeToSVG(); 279 void SizeToSVG();
277 void SizeToDefault(); 280 void SizeToDefault();
278 void SizeTo(int width, int height); 281 void SizeTo(int width, int height);
279 void ResizeSubViews(); 282 void ResizeSubViews();
280 283
281 // Set the focus in interactive mode (pass through to relevant system call). 284 // Set the focus in interactive mode (pass through to relevant system call).
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
346 #if defined(OS_WIN) 349 #if defined(OS_WIN)
347 // Used by the watchdog to know when it's finished. 350 // Used by the watchdog to know when it's finished.
348 HANDLE finished_event_; 351 HANDLE finished_event_;
349 #endif 352 #endif
350 353
351 // Dump the stats table counters on exit. 354 // Dump the stats table counters on exit.
352 bool dump_stats_table_on_exit_; 355 bool dump_stats_table_on_exit_;
353 }; 356 };
354 357
355 #endif // WEBKIT_TOOLS_TEST_SHELL_TEST_SHELL_H_ 358 #endif // WEBKIT_TOOLS_TEST_SHELL_TEST_SHELL_H_
OLDNEW
« no previous file with comments | « webkit/glue/webkitclient_impl.cc ('k') | webkit/tools/test_shell/test_shell_gtk.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698