summaryrefslogtreecommitdiffstats
path: root/chrome/browser/devtools
diff options
context:
space:
mode:
authorpfeldman@chromium.org <pfeldman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-03-29 14:32:40 +0000
committerpfeldman@chromium.org <pfeldman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-03-29 14:32:40 +0000
commitf330bfb69296f07ea905195421e8963c58129645 (patch)
tree837336dc42a5b19a9ba87924f3fd492a934f611a /chrome/browser/devtools
parent0947edb55ccb9a91a184bc5115fbd1d509520614 (diff)
downloadchromium_src-f330bfb69296f07ea905195421e8963c58129645.zip
chromium_src-f330bfb69296f07ea905195421e8963c58129645.tar.gz
chromium_src-f330bfb69296f07ea905195421e8963c58129645.tar.bz2
DevTools: navigating to chrome://inspect crashes when there is no ADB.
BUG=223472 Review URL: https://chromiumcodereview.appspot.com/13186003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@191349 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/devtools')
-rw-r--r--chrome/browser/devtools/adb_client_socket.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/devtools/adb_client_socket.cc b/chrome/browser/devtools/adb_client_socket.cc
index a64171d..4cc901a 100644
--- a/chrome/browser/devtools/adb_client_socket.cc
+++ b/chrome/browser/devtools/adb_client_socket.cc
@@ -277,7 +277,7 @@ class AdbQuerySocket : AdbClientSocket {
bool CheckNetResultOrDie(int result) {
if (result >= 0)
return true;
- callback_.Run(result, NULL);
+ callback_.Run(result, std::string());
delete this;
return false;
}