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

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

Issue 10384128: Quote WebPreferences in namespace webkit_glue. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Copyright 2012 Created 8 years, 7 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 | « webkit/tools/test_shell/test_shell.h ('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 // 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 #undef LOG 5 #undef LOG
6 6
7 #include "webkit/tools/test_shell/test_shell.h" 7 #include "webkit/tools/test_shell/test_shell.h"
8 8
9 #include "base/base_paths.h" 9 #include "base/base_paths.h"
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
56 #include "webkit/tools/test_shell/test_webview_delegate.h" 56 #include "webkit/tools/test_shell/test_webview_delegate.h"
57 57
58 using WebKit::WebCanvas; 58 using WebKit::WebCanvas;
59 using WebKit::WebFrame; 59 using WebKit::WebFrame;
60 using WebKit::WebNavigationPolicy; 60 using WebKit::WebNavigationPolicy;
61 using WebKit::WebRect; 61 using WebKit::WebRect;
62 using WebKit::WebScriptController; 62 using WebKit::WebScriptController;
63 using WebKit::WebSize; 63 using WebKit::WebSize;
64 using WebKit::WebURLRequest; 64 using WebKit::WebURLRequest;
65 using WebKit::WebView; 65 using WebKit::WebView;
66 using webkit_glue::WebPreferences;
66 67
67 namespace { 68 namespace {
68 69
69 // Default timeout in ms for file page loads when in layout test mode. 70 // Default timeout in ms for file page loads when in layout test mode.
70 const int kDefaultFileTestTimeoutMillisecs = 10 * 1000; 71 const int kDefaultFileTestTimeoutMillisecs = 10 * 1000;
71 72
72 // Content area size for newly created windows. 73 // Content area size for newly created windows.
73 const int kTestWindowWidth = 800; 74 const int kTestWindowWidth = 800;
74 const int kTestWindowHeight = 600; 75 const int kTestWindowHeight = 600;
75 76
(...skipping 529 matching lines...) Expand 10 before | Expand all | Expand 10 after
605 return device_orientation_client_mock_.get(); 606 return device_orientation_client_mock_.get();
606 } 607 }
607 608
608 WebKit::WebGeolocationClientMock* TestShell::geolocation_client_mock() { 609 WebKit::WebGeolocationClientMock* TestShell::geolocation_client_mock() {
609 if (!geolocation_client_mock_.get()) { 610 if (!geolocation_client_mock_.get()) {
610 geolocation_client_mock_.reset( 611 geolocation_client_mock_.reset(
611 WebKit::WebGeolocationClientMock::create()); 612 WebKit::WebGeolocationClientMock::create());
612 } 613 }
613 return geolocation_client_mock_.get(); 614 return geolocation_client_mock_.get();
614 } 615 }
OLDNEW
« no previous file with comments | « webkit/tools/test_shell/test_shell.h ('k') | webkit/tools/test_shell/test_shell_gtk.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698