| Index: chrome/browser/devtools/devtools_ui_bindings.h
|
| diff --git a/chrome/browser/devtools/devtools_ui_bindings.h b/chrome/browser/devtools/devtools_ui_bindings.h
|
| index 7cc2f37f3f412d406079a9ac9965c38f0128390f..8ebd805f378f6c9644711fed1401512b666de4c9 100644
|
| --- a/chrome/browser/devtools/devtools_ui_bindings.h
|
| +++ b/chrome/browser/devtools/devtools_ui_bindings.h
|
| @@ -116,8 +116,8 @@ class DevToolsUIBindings : public content::NotificationObserver,
|
| virtual void ResetZoom() OVERRIDE;
|
| virtual void OpenUrlOnRemoteDeviceAndInspect(const std::string& browser_id,
|
| const std::string& url) OVERRIDE;
|
| - virtual void Subscribe(const std::string& event_type) OVERRIDE;
|
| - virtual void Unsubscribe(const std::string& event_type) OVERRIDE;
|
| + virtual void SetDeviceCountUpdatesEnabled(bool enabled) OVERRIDE;
|
| + virtual void SetDevicesUpdatesEnabled(bool enabled) OVERRIDE;
|
|
|
| void EnableRemoteDeviceCounter(bool enable);
|
|
|
| @@ -125,8 +125,8 @@ class DevToolsUIBindings : public content::NotificationObserver,
|
| virtual void DeviceCountChanged(int count) OVERRIDE;
|
|
|
| // Forwards discovered devices to frontend.
|
| - virtual void PopulateRemoteDevices(const std::string& source,
|
| - const base::ListValue& targets);
|
| + virtual void DevicesUpdated(const std::string& source,
|
| + const base::ListValue& targets);
|
|
|
| void DocumentOnLoadCompletedInMainFrame();
|
|
|
| @@ -155,9 +155,6 @@ class DevToolsUIBindings : public content::NotificationObserver,
|
| void UpdateTheme();
|
| void AddDevToolsExtensionsToClient();
|
|
|
| - void DispatchEventOnFrontend(const std::string& event_type,
|
| - const base::Value& event_data);
|
| -
|
| class FrontendWebContentsObserver;
|
| friend class FrontendWebContentsObserver;
|
| scoped_ptr<FrontendWebContentsObserver> frontend_contents_observer_;
|
| @@ -165,7 +162,6 @@ class DevToolsUIBindings : public content::NotificationObserver,
|
| Profile* profile_;
|
| content::WebContents* web_contents_;
|
| scoped_ptr<Delegate> delegate_;
|
| - bool device_listener_enabled_;
|
| content::NotificationRegistrar registrar_;
|
| scoped_ptr<content::DevToolsClientHost> frontend_host_;
|
| scoped_ptr<DevToolsFileHelper> file_helper_;
|
| @@ -176,8 +172,8 @@ class DevToolsUIBindings : public content::NotificationObserver,
|
| IndexingJobsMap;
|
| IndexingJobsMap indexing_jobs_;
|
|
|
| - typedef std::set<std::string> Subscribers;
|
| - Subscribers subscribers_;
|
| + bool device_count_updates_enabled_;
|
| + bool devices_updates_enabled_;
|
| scoped_ptr<DevToolsTargetsUIHandler> remote_targets_handler_;
|
| scoped_ptr<DevToolsEmbedderMessageDispatcher> embedder_message_dispatcher_;
|
| GURL url_;
|
|
|