Commit bd7a5660 authored by dcheng's avatar dcheng Committed by Commit bot

Manual devtools fixups for scoped_refptr operator T* removal.

BUG=110610
TBR=kaznacheev@chromium.org

Review URL: https://codereview.chromium.org/513673004

Cr-Commit-Position: refs/heads/master@{#292363}
parent 1f3d9f01
......@@ -621,7 +621,7 @@ void AndroidUsbDevice::TransferError(UsbTransferStatus status) {
void AndroidUsbDevice::TerminateIfReleased(
scoped_refptr<UsbDeviceHandle> usb_handle) {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
if (usb_handle->GetDevice())
if (usb_handle->GetDevice().get())
return;
message_loop_->PostTask(FROM_HERE,
base::Bind(&AndroidUsbDevice::Terminate, this));
......
......@@ -793,7 +793,8 @@ void DevToolsUIBindings::SetDelegate(Delegate* delegate) {
delegate_.reset(delegate);
}
void DevToolsUIBindings::AttachTo(content::DevToolsAgentHost* agent_host) {
void DevToolsUIBindings::AttachTo(
const scoped_refptr<content::DevToolsAgentHost>& agent_host) {
if (agent_host_.get())
Detach();
agent_host_ = agent_host;
......
......@@ -73,7 +73,7 @@ class DevToolsUIBindings : public content::NotificationObserver,
const base::Value* arg1,
const base::Value* arg2,
const base::Value* arg3);
void AttachTo(content::DevToolsAgentHost* agent_host);
void AttachTo(const scoped_refptr<content::DevToolsAgentHost>& agent_host);
void Reattach();
void Detach();
bool IsAttachedTo(content::DevToolsAgentHost* agent_host);
......
......@@ -419,8 +419,8 @@ bool DevToolsWindow::IsDevToolsWindow(content::WebContents* web_contents) {
// static
DevToolsWindow* DevToolsWindow::OpenDevToolsWindowForWorker(
Profile* profile,
DevToolsAgentHost* worker_agent) {
DevToolsWindow* window = FindDevToolsWindow(worker_agent);
const scoped_refptr<DevToolsAgentHost>& worker_agent) {
DevToolsWindow* window = FindDevToolsWindow(worker_agent.get());
if (!window) {
window = DevToolsWindow::CreateDevToolsWindowForWorker(profile);
window->bindings_->AttachTo(worker_agent);
......@@ -470,9 +470,9 @@ DevToolsWindow* DevToolsWindow::ToggleDevToolsWindow(
void DevToolsWindow::OpenExternalFrontend(
Profile* profile,
const std::string& frontend_url,
content::DevToolsAgentHost* agent_host,
const scoped_refptr<content::DevToolsAgentHost>& agent_host,
bool isWorker) {
DevToolsWindow* window = FindDevToolsWindow(agent_host);
DevToolsWindow* window = FindDevToolsWindow(agent_host.get());
if (!window) {
window = Create(profile, DevToolsUI::GetProxyURL(frontend_url), NULL,
isWorker, true, false, "");
......
......@@ -82,13 +82,13 @@ class DevToolsWindow : public DevToolsUIBindings::Delegate,
static void OpenExternalFrontend(
Profile* profile,
const std::string& frontend_uri,
content::DevToolsAgentHost* agent_host,
const scoped_refptr<content::DevToolsAgentHost>& agent_host,
bool isWorker);
// Worker frontend is always undocked.
static DevToolsWindow* OpenDevToolsWindowForWorker(
Profile* profile,
content::DevToolsAgentHost* worker_agent);
const scoped_refptr<content::DevToolsAgentHost>& worker_agent);
static void InspectElement(content::WebContents* inspected_web_contents,
int x,
......
......@@ -343,7 +343,7 @@ void InspectUI::InspectBrowserWithCustomFrontend(
// Install devtools bindings.
DevToolsUIBindingsEnabler* bindings_enabler =
new DevToolsUIBindingsEnabler(front_end, frontend_url);
bindings_enabler->GetBindings()->AttachTo(agent_host.get());
bindings_enabler->GetBindings()->AttachTo(agent_host);
}
void InspectUI::InspectDevices(Browser* browser) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment