chrome://inspect: Better support for multiple browsers and older versions of mobile Chrome

chrome/browser/ui/webui/inspect_ui.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/webui/inspect_ui.h"
 
 #include <set>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 74 matching lines @@
 static const char kTargetTypeField[]  = "type";
 static const char kAttachedField[]  = "attached";
 static const char kProcessIdField[]  = "processId";
 static const char kRouteIdField[]  = "routeId";
 static const char kUrlField[]  = "url";
 static const char kNameField[]  = "name";
 static const char kFaviconUrlField[] = "faviconUrl";
 static const char kPidField[]  = "pid";
 static const char kAdbSerialField[] = "adbSerial";
 static const char kAdbModelField[] = "adbModel";
-static const char kAdbBrowserNameField[] = "adbBrowserName";
+static const char kAdbBrowserProductField[] = "adbBrowserProduct";
+static const char kAdbBrowserVersionField[] = "adbBrowserVersion";
 static const char kAdbGlobalIdField[] = "adbGlobalId";
 static const char kAdbBrowsersField[] = "browsers";
 static const char kAdbPagesField[] = "pages";
 static const char kAdbPortStatus[] = "adbPortStatus";
 
 DictionaryValue* BuildTargetDescriptor(
     const std::string& target_type,
     bool attached,
     const GURL& url,
     const std::string& name,
@@ skipping 483 matching lines @@
         device->serial().c_str());
     device_data->SetString(kAdbGlobalIdField, device_id);
     ListValue* browser_list = new ListValue();
     device_data->Set(kAdbBrowsersField, browser_list);
 
     DevToolsAdbBridge::RemoteBrowsers& browsers = device->browsers();
     for (DevToolsAdbBridge::RemoteBrowsers::iterator bit =
         browsers.begin(); bit != browsers.end(); ++bit) {
       DevToolsAdbBridge::RemoteBrowser* browser = bit->get();
       DictionaryValue* browser_data = new DictionaryValue();
-      browser_data->SetString(kAdbBrowserNameField, browser->name());
+      browser_data->SetString(kAdbBrowserProductField, browser->product());
+      browser_data->SetString(kAdbBrowserVersionField, browser->version());
       std::string browser_id = base::StringPrintf(
           "browser:%s:%s:%s",
           device->serial().c_str(),
-          browser->socket().c_str(),
-          browser->name().c_str());
+          browser->product().c_str(),  // Force sorting by product name.
+          browser->socket().c_str());
       browser_data->SetString(kAdbGlobalIdField, browser_id);
       remote_browsers_[browser_id] = browser;
       ListValue* page_list = new ListValue();
       browser_data->Set(kAdbPagesField, page_list);
 
       DevToolsAdbBridge::RemotePages& pages = browser->pages();
       for (DevToolsAdbBridge::RemotePages::iterator it =
           pages.begin(); it != pages.end(); ++it) {
         DevToolsAdbBridge::RemotePage* page =  it->get();
         DictionaryValue* page_data = BuildTargetDescriptor(
@@ skipping 33 matching lines @@
   web_ui()->CallJavascriptFunction("updatePortForwardingEnabled", *value);
 
 }
 
 void InspectUI::UpdatePortForwardingConfig() {
   Profile* profile = Profile::FromWebUI(web_ui());
   const base::Value* value = profile->GetPrefs()->FindPreference(
       prefs::kDevToolsPortForwardingConfig)->GetValue();
   web_ui()->CallJavascriptFunction("updatePortForwardingConfig", *value);
 }