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

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

Issue 10829258: Clean-up inline members of nested classes (webkit/) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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 | « webkit/tools/test_shell/test_shell.h ('k') | no next file » | 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 100 matching lines...) Expand 10 before | Expand all | Expand 10 after
111 bool TestShell::layout_test_mode_ = false; 111 bool TestShell::layout_test_mode_ = false;
112 bool TestShell::allow_external_pages_ = false; 112 bool TestShell::allow_external_pages_ = false;
113 int TestShell::file_test_timeout_ms_ = kDefaultFileTestTimeoutMillisecs; 113 int TestShell::file_test_timeout_ms_ = kDefaultFileTestTimeoutMillisecs;
114 bool TestShell::test_is_preparing_ = false; 114 bool TestShell::test_is_preparing_ = false;
115 bool TestShell::test_is_pending_ = false; 115 bool TestShell::test_is_pending_ = false;
116 int TestShell::load_count_ = 1; 116 int TestShell::load_count_ = 1;
117 std::vector<std::string> TestShell::js_flags_; 117 std::vector<std::string> TestShell::js_flags_;
118 bool TestShell::accelerated_2d_canvas_enabled_ = false; 118 bool TestShell::accelerated_2d_canvas_enabled_ = false;
119 bool TestShell::accelerated_compositing_enabled_ = false; 119 bool TestShell::accelerated_compositing_enabled_ = false;
120 120
121 TestShell::TestParams::TestParams()
122 : dump_tree(true),
123 dump_pixels(false) {
124 }
125
121 TestShell::TestShell() 126 TestShell::TestShell()
122 : m_mainWnd(NULL), 127 : m_mainWnd(NULL),
123 m_editWnd(NULL), 128 m_editWnd(NULL),
124 m_webViewHost(NULL), 129 m_webViewHost(NULL),
125 m_popupHost(NULL), 130 m_popupHost(NULL),
126 m_focusedWidgetHost(NULL), 131 m_focusedWidgetHost(NULL),
127 #if defined(OS_WIN) 132 #if defined(OS_WIN)
128 default_edit_wnd_proc_(0), 133 default_edit_wnd_proc_(0),
129 #endif 134 #endif
130 test_params_(NULL), 135 test_params_(NULL),
(...skipping 475 matching lines...) Expand 10 before | Expand all | Expand 10 after
606 return device_orientation_client_mock_.get(); 611 return device_orientation_client_mock_.get();
607 } 612 }
608 613
609 WebKit::WebGeolocationClientMock* TestShell::geolocation_client_mock() { 614 WebKit::WebGeolocationClientMock* TestShell::geolocation_client_mock() {
610 if (!geolocation_client_mock_.get()) { 615 if (!geolocation_client_mock_.get()) {
611 geolocation_client_mock_.reset( 616 geolocation_client_mock_.reset(
612 WebKit::WebGeolocationClientMock::create()); 617 WebKit::WebGeolocationClientMock::create());
613 } 618 }
614 return geolocation_client_mock_.get(); 619 return geolocation_client_mock_.get();
615 } 620 }
OLDNEW
« no previous file with comments | « webkit/tools/test_shell/test_shell.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698