| Index: chrome/browser/ui/webui/inspect_ui.h
|
| diff --git a/chrome/browser/ui/webui/inspect_ui.h b/chrome/browser/ui/webui/inspect_ui.h
|
| index 7be764cf23d27247b53a4da354035346b0d1f3ec..6d48b3c808287416b94664ccb311568abe097770 100644
|
| --- a/chrome/browser/ui/webui/inspect_ui.h
|
| +++ b/chrome/browser/ui/webui/inspect_ui.h
|
| @@ -21,7 +21,6 @@ class Value;
|
| }
|
|
|
| class Browser;
|
| -class DevToolsTargetImpl;
|
|
|
| class InspectUI : public content::WebUIController,
|
| public content::NotificationObserver,
|
| @@ -31,18 +30,18 @@ class InspectUI : public content::WebUIController,
|
| virtual ~InspectUI();
|
|
|
| void InitUI();
|
| - DevToolsTargetImpl* FindTarget(const std::string& type,
|
| - const std::string& id);
|
| - scoped_refptr<DevToolsAdbBridge::RemoteBrowser> FindRemoteBrowser(
|
| - const std::string& id);
|
| + void InspectRemotePage(const std::string& page_id);
|
| + void ActivateRemotePage(const std::string& page_id);
|
| + void CloseRemotePage(const std::string& page_id);
|
| + void ReloadRemotePage(const std::string& page_id);
|
| + void OpenRemotePage(const std::string& browser_id, const std::string& url);
|
|
|
| static void InspectDevices(Browser* browser);
|
|
|
| private:
|
| class WorkerCreationDestructionListener;
|
|
|
| - void PopulateWebContentsTargets();
|
| - void PopulateWorkerTargets(const std::vector<DevToolsTargetImpl*>&);
|
| + void PopulateLists();
|
|
|
| // content::NotificationObserver overrides.
|
| virtual void Observe(int type,
|
| @@ -74,10 +73,9 @@ class InspectUI : public content::WebUIController,
|
| // A scoped container for preference change registries.
|
| PrefChangeRegistrar pref_change_registrar_;
|
|
|
| - typedef std::map<std::string, DevToolsTargetImpl*> TargetMap;
|
| - TargetMap web_contents_targets_;
|
| - TargetMap worker_targets_;
|
| - TargetMap remote_targets_;
|
| + typedef std::map<std::string, scoped_refptr<DevToolsAdbBridge::RemotePage> >
|
| + RemotePages;
|
| + RemotePages remote_pages_;
|
|
|
| typedef std::map<std::string,
|
| scoped_refptr<DevToolsAdbBridge::RemoteBrowser> > RemoteBrowsers;
|
|
|