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

Side by Side Diff: chrome/test/chromedriver/chrome/web_view_impl.h

Issue 23566018: [chromedriver] Remove Logger and just use base LOG. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: address comments Created 7 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
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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_CHROMEDRIVER_CHROME_WEB_VIEW_IMPL_H_ 5 #ifndef CHROME_TEST_CHROMEDRIVER_CHROME_WEB_VIEW_IMPL_H_
6 #define CHROME_TEST_CHROMEDRIVER_CHROME_WEB_VIEW_IMPL_H_ 6 #define CHROME_TEST_CHROMEDRIVER_CHROME_WEB_VIEW_IMPL_H_
7 7
8 #include <list> 8 #include <list>
9 #include <string> 9 #include <string>
10 10
11 #include "base/callback.h" 11 #include "base/callback.h"
12 #include "base/compiler_specific.h" 12 #include "base/compiler_specific.h"
13 #include "base/memory/scoped_ptr.h" 13 #include "base/memory/scoped_ptr.h"
14 #include "chrome/test/chromedriver/chrome/web_view.h" 14 #include "chrome/test/chromedriver/chrome/web_view.h"
15 15
16 namespace base { 16 namespace base {
17 class DictionaryValue; 17 class DictionaryValue;
18 class ListValue; 18 class ListValue;
19 class Value; 19 class Value;
20 } 20 }
21 21
22 class DevToolsClient; 22 class DevToolsClient;
23 class DomTracker; 23 class DomTracker;
24 class FrameTracker; 24 class FrameTracker;
25 class GeolocationOverrideManager; 25 class GeolocationOverrideManager;
26 struct KeyEvent; 26 struct KeyEvent;
27 class Log;
28 struct MouseEvent; 27 struct MouseEvent;
29 class NavigationTracker; 28 class NavigationTracker;
30 class Status; 29 class Status;
31 30
32 class WebViewImpl : public WebView { 31 class WebViewImpl : public WebView {
33 public: 32 public:
34 WebViewImpl(const std::string& id, 33 WebViewImpl(const std::string& id,
35 int build_no, 34 int build_no,
36 scoped_ptr<DevToolsClient> client, 35 scoped_ptr<DevToolsClient> client);
37 Log* log);
38 virtual ~WebViewImpl(); 36 virtual ~WebViewImpl();
39 37
40 // Overridden from WebView: 38 // Overridden from WebView:
41 virtual std::string GetId() OVERRIDE; 39 virtual std::string GetId() OVERRIDE;
42 virtual Status ConnectIfNecessary() OVERRIDE; 40 virtual Status ConnectIfNecessary() OVERRIDE;
43 virtual Status HandleReceivedEvents() OVERRIDE; 41 virtual Status HandleReceivedEvents() OVERRIDE;
44 virtual Status Load(const std::string& url) OVERRIDE; 42 virtual Status Load(const std::string& url) OVERRIDE;
45 virtual Status Reload() OVERRIDE; 43 virtual Status Reload() OVERRIDE;
46 virtual Status EvaluateScript(const std::string& frame, 44 virtual Status EvaluateScript(const std::string& frame,
47 const std::string& expression, 45 const std::string& expression,
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
96 Status IsNotPendingNavigation(const std::string& frame_id, 94 Status IsNotPendingNavigation(const std::string& frame_id,
97 bool* is_not_pending); 95 bool* is_not_pending);
98 std::string id_; 96 std::string id_;
99 int build_no_; 97 int build_no_;
100 scoped_ptr<DomTracker> dom_tracker_; 98 scoped_ptr<DomTracker> dom_tracker_;
101 scoped_ptr<FrameTracker> frame_tracker_; 99 scoped_ptr<FrameTracker> frame_tracker_;
102 scoped_ptr<NavigationTracker> navigation_tracker_; 100 scoped_ptr<NavigationTracker> navigation_tracker_;
103 scoped_ptr<JavaScriptDialogManager> dialog_manager_; 101 scoped_ptr<JavaScriptDialogManager> dialog_manager_;
104 scoped_ptr<GeolocationOverrideManager> geolocation_override_manager_; 102 scoped_ptr<GeolocationOverrideManager> geolocation_override_manager_;
105 scoped_ptr<DevToolsClient> client_; 103 scoped_ptr<DevToolsClient> client_;
106 Log* log_;
107 }; 104 };
108 105
109 namespace internal { 106 namespace internal {
110 107
111 enum EvaluateScriptReturnType { 108 enum EvaluateScriptReturnType {
112 ReturnByValue, 109 ReturnByValue,
113 ReturnByObject 110 ReturnByObject
114 }; 111 };
115 Status EvaluateScript(DevToolsClient* client, 112 Status EvaluateScript(DevToolsClient* client,
116 int context_id, 113 int context_id,
(...skipping 14 matching lines...) Expand all
131 Status GetNodeIdFromFunction(DevToolsClient* client, 128 Status GetNodeIdFromFunction(DevToolsClient* client,
132 int context_id, 129 int context_id,
133 const std::string& function, 130 const std::string& function,
134 const base::ListValue& args, 131 const base::ListValue& args,
135 bool* found_node, 132 bool* found_node,
136 int* node_id); 133 int* node_id);
137 134
138 } // namespace internal 135 } // namespace internal
139 136
140 #endif // CHROME_TEST_CHROMEDRIVER_CHROME_WEB_VIEW_IMPL_H_ 137 #endif // CHROME_TEST_CHROMEDRIVER_CHROME_WEB_VIEW_IMPL_H_
OLDNEW
« no previous file with comments | « chrome/test/chromedriver/chrome/util.cc ('k') | chrome/test/chromedriver/chrome/web_view_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698