OLD | NEW |
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 #ifndef CHROME_BROWSER_AUTOMATION_AUTOMATION_PROVIDER_OBSERVERS_H_ | 5 #ifndef CHROME_BROWSER_AUTOMATION_AUTOMATION_PROVIDER_OBSERVERS_H_ |
6 #define CHROME_BROWSER_AUTOMATION_AUTOMATION_PROVIDER_OBSERVERS_H_ | 6 #define CHROME_BROWSER_AUTOMATION_AUTOMATION_PROVIDER_OBSERVERS_H_ |
7 #pragma once | 7 #pragma once |
8 | 8 |
9 #include <deque> | 9 #include <deque> |
10 #include <map> | 10 #include <map> |
(...skipping 257 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
268 protected: | 268 protected: |
269 content::NotificationRegistrar registrar_; | 269 content::NotificationRegistrar registrar_; |
270 base::WeakPtr<AutomationProvider> automation_; | 270 base::WeakPtr<AutomationProvider> automation_; |
271 int notification_; | 271 int notification_; |
272 }; | 272 }; |
273 | 273 |
274 class TabAppendedNotificationObserver : public TabStripNotificationObserver { | 274 class TabAppendedNotificationObserver : public TabStripNotificationObserver { |
275 public: | 275 public: |
276 TabAppendedNotificationObserver(Browser* parent, | 276 TabAppendedNotificationObserver(Browser* parent, |
277 AutomationProvider* automation, | 277 AutomationProvider* automation, |
278 IPC::Message* reply_message); | 278 IPC::Message* reply_message, |
| 279 bool use_json_interface); |
279 virtual ~TabAppendedNotificationObserver(); | 280 virtual ~TabAppendedNotificationObserver(); |
280 | 281 |
281 virtual void ObserveTab(content::NavigationController* controller); | 282 virtual void ObserveTab(content::NavigationController* controller); |
| 283 IPC::Message* ReleaseReply(); |
282 | 284 |
283 protected: | 285 protected: |
284 Browser* parent_; | 286 Browser* parent_; |
285 scoped_ptr<IPC::Message> reply_message_; | 287 scoped_ptr<IPC::Message> reply_message_; |
| 288 bool use_json_interface_; |
286 | 289 |
287 private: | 290 private: |
288 DISALLOW_COPY_AND_ASSIGN(TabAppendedNotificationObserver); | 291 DISALLOW_COPY_AND_ASSIGN(TabAppendedNotificationObserver); |
289 }; | 292 }; |
290 | 293 |
291 class TabClosedNotificationObserver : public TabStripNotificationObserver { | 294 class TabClosedNotificationObserver : public TabStripNotificationObserver { |
292 public: | 295 public: |
293 TabClosedNotificationObserver(AutomationProvider* automation, | 296 TabClosedNotificationObserver(AutomationProvider* automation, |
294 bool wait_until_closed, | 297 bool wait_until_closed, |
295 IPC::Message* reply_message); | 298 IPC::Message* reply_message); |
(...skipping 1675 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1971 base::WeakPtr<AutomationProvider> automation_; | 1974 base::WeakPtr<AutomationProvider> automation_; |
1972 scoped_ptr<IPC::Message> reply_message_; | 1975 scoped_ptr<IPC::Message> reply_message_; |
1973 int new_window_id_; | 1976 int new_window_id_; |
1974 int num_loads_; | 1977 int num_loads_; |
1975 | 1978 |
1976 DISALLOW_COPY_AND_ASSIGN( | 1979 DISALLOW_COPY_AND_ASSIGN( |
1977 BrowserOpenedWithExistingProfileNotificationObserver); | 1980 BrowserOpenedWithExistingProfileNotificationObserver); |
1978 }; | 1981 }; |
1979 | 1982 |
1980 #endif // CHROME_BROWSER_AUTOMATION_AUTOMATION_PROVIDER_OBSERVERS_H_ | 1983 #endif // CHROME_BROWSER_AUTOMATION_AUTOMATION_PROVIDER_OBSERVERS_H_ |
OLD | NEW |