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

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

Issue 204008: Fix tests involving multiple windows that log frame load events.... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' 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 | 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) 2006-2009 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2006-2009 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 81 matching lines...) Expand 10 before | Expand all | Expand 10 after
92 DISALLOW_COPY_AND_ASSIGN(URLRequestTestShellFileJob); 92 DISALLOW_COPY_AND_ASSIGN(URLRequestTestShellFileJob);
93 }; 93 };
94 94
95 } // namespace 95 } // namespace
96 96
97 // Initialize static member variable 97 // Initialize static member variable
98 WindowList* TestShell::window_list_; 98 WindowList* TestShell::window_list_;
99 WebPreferences* TestShell::web_prefs_ = NULL; 99 WebPreferences* TestShell::web_prefs_ = NULL;
100 bool TestShell::layout_test_mode_ = false; 100 bool TestShell::layout_test_mode_ = false;
101 int TestShell::file_test_timeout_ms_ = kDefaultFileTestTimeoutMillisecs; 101 int TestShell::file_test_timeout_ms_ = kDefaultFileTestTimeoutMillisecs;
102 bool TestShell::test_is_preparing_ = false;
103 bool TestShell::test_is_pending_ = false;
102 104
103 TestShell::TestShell() 105 TestShell::TestShell()
104 : m_mainWnd(NULL), 106 : m_mainWnd(NULL),
105 m_editWnd(NULL), 107 m_editWnd(NULL),
106 m_webViewHost(NULL), 108 m_webViewHost(NULL),
107 m_popupHost(NULL), 109 m_popupHost(NULL),
108 m_focusedWidgetHost(NULL), 110 m_focusedWidgetHost(NULL),
109 #if defined(OS_WIN) 111 #if defined(OS_WIN)
110 default_edit_wnd_proc_(0), 112 default_edit_wnd_proc_(0),
111 #endif 113 #endif
112 test_params_(NULL), 114 test_params_(NULL),
113 test_is_preparing_(false),
114 test_is_pending_(false),
115 is_modal_(false), 115 is_modal_(false),
116 dump_stats_table_on_exit_(false) { 116 dump_stats_table_on_exit_(false) {
117 delegate_.reset(new TestWebViewDelegate(this)); 117 delegate_.reset(new TestWebViewDelegate(this));
118 popup_delegate_.reset(new TestWebViewDelegate(this)); 118 popup_delegate_.reset(new TestWebViewDelegate(this));
119 layout_test_controller_.reset(new LayoutTestController(this)); 119 layout_test_controller_.reset(new LayoutTestController(this));
120 event_sending_controller_.reset(new EventSendingController(this)); 120 event_sending_controller_.reset(new EventSendingController(this));
121 text_input_controller_.reset(new TextInputController(this)); 121 text_input_controller_.reset(new TextInputController(this));
122 navigation_controller_.reset(new TestNavigationController(this)); 122 navigation_controller_.reset(new TestNavigationController(this));
123 123
124 URLRequestFilter* filter = URLRequestFilter::GetInstance(); 124 URLRequestFilter* filter = URLRequestFilter::GetInstance();
(...skipping 550 matching lines...) Expand 10 before | Expand all | Expand 10 after
675 675
676 void CloseIdleConnections() { 676 void CloseIdleConnections() {
677 // Used in benchmarking, Ignored for test_shell. 677 // Used in benchmarking, Ignored for test_shell.
678 } 678 }
679 679
680 void SetCacheMode(bool enabled) { 680 void SetCacheMode(bool enabled) {
681 // Used in benchmarking, Ignored for test_shell. 681 // Used in benchmarking, Ignored for test_shell.
682 } 682 }
683 683
684 } // namespace webkit_glue 684 } // namespace webkit_glue
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