Chromium Code Reviews

Side by Side Diff: chrome/test/automation/tab_proxy.h

Issue 5959006: Revert 70144 and 70145 and add a build fix. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 10 years ago
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff | | Annotate | Revision Log
« no previous file with comments | « chrome/common/ipc_test_sink.cc ('k') | chrome_frame/chrome_frame_automation.h » ('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) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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_AUTOMATION_TAB_PROXY_H_ 5 #ifndef CHROME_TEST_AUTOMATION_TAB_PROXY_H_
6 #define CHROME_TEST_AUTOMATION_TAB_PROXY_H_ 6 #define CHROME_TEST_AUTOMATION_TAB_PROXY_H_
7 #pragma once 7 #pragma once
8 8
9 #include "build/build_config.h" // NOLINT 9 #include "build/build_config.h" // NOLINT
10 10
(...skipping 30 matching lines...)
41 MEDIUM_FONT = 16, 41 MEDIUM_FONT = 16,
42 LARGE_FONT = 24, 42 LARGE_FONT = 24,
43 LARGEST_FONT = 36 43 LARGEST_FONT = 36
44 }; 44 };
45 45
46 class TabProxy : public AutomationResourceProxy, 46 class TabProxy : public AutomationResourceProxy,
47 public JavaScriptExecutionController { 47 public JavaScriptExecutionController {
48 public: 48 public:
49 class TabProxyDelegate { 49 class TabProxyDelegate {
50 public: 50 public:
51 virtual void OnMessageReceived(TabProxy* tab, const IPC::Message& msg) {} 51 virtual bool OnMessageReceived(TabProxy* tab, const IPC::Message& msg) {
52 return false;
53 }
52 virtual void OnChannelError(TabProxy* tab) {} 54 virtual void OnChannelError(TabProxy* tab) {}
53 55
54 protected: 56 protected:
55 virtual ~TabProxyDelegate() {} 57 virtual ~TabProxyDelegate() {}
56 }; 58 };
57 59
58 TabProxy(AutomationMessageSender* sender, 60 TabProxy(AutomationMessageSender* sender,
59 AutomationHandleTracker* tracker, 61 AutomationHandleTracker* tracker,
60 int handle); 62 int handle);
61 63
(...skipping 361 matching lines...)
423 // purposes. 425 // purposes.
424 void LastObjectRemoved(); 426 void LastObjectRemoved();
425 427
426 private: 428 private:
427 Lock list_lock_; // Protects the observers_list_. 429 Lock list_lock_; // Protects the observers_list_.
428 ObserverList<TabProxyDelegate> observers_list_; 430 ObserverList<TabProxyDelegate> observers_list_;
429 DISALLOW_COPY_AND_ASSIGN(TabProxy); 431 DISALLOW_COPY_AND_ASSIGN(TabProxy);
430 }; 432 };
431 433
432 #endif // CHROME_TEST_AUTOMATION_TAB_PROXY_H_ 434 #endif // CHROME_TEST_AUTOMATION_TAB_PROXY_H_
OLDNEW
« no previous file with comments | « chrome/common/ipc_test_sink.cc ('k') | chrome_frame/chrome_frame_automation.h » ('j') | no next file with comments »

Powered by Google App Engine