DevTools: Improve design of WebViews available for inspection in chrome://inspect

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 87 matching lines @@
 static const char kPidField[]  = "pid";
 static const char kAdbSerialField[] = "adbSerial";
 static const char kAdbModelField[] = "adbModel";
 static const char kAdbBrowserProductField[] = "adbBrowserProduct";
 static const char kAdbBrowserPackageField[] = "adbBrowserPackage";
 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";
+static const char kAdbScreenWidthField[] = "adbScreenWidth";
+static const char kAdbScreenHeightField[] = "adbScreenHeight";
 static const char kGuestList[] = "guests";
 
 DictionaryValue* BuildTargetDescriptor(
     const std::string& target_type,
     bool attached,
     const GURL& url,
     const std::string& name,
     const GURL& favicon_url,
     const std::string& description,
     int process_id,
@@ skipping 546 matching lines @@
     DevToolsAdbBridge::RemoteDevices* devices) {
   remote_browsers_.clear();
   remote_pages_.clear();
   ListValue device_list;
   for (DevToolsAdbBridge::RemoteDevices::iterator dit = devices->begin();
        dit != devices->end(); ++dit) {
     DevToolsAdbBridge::RemoteDevice* device = dit->get();
     DictionaryValue* device_data = new DictionaryValue();
     device_data->SetString(kAdbModelField, device->model());
     device_data->SetString(kAdbSerialField, device->serial());
+    device_data->SetInteger(kAdbScreenWidthField, device->screenWidth());
+    device_data->SetInteger(kAdbScreenHeightField, device->screenHeight());
     std::string device_id = base::StringPrintf(
         "device:%s",
         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(kAdbBrowserProductField, browser->product());
       browser_data->SetString(kAdbBrowserPackageField, browser->package());
       browser_data->SetString(kAdbBrowserVersionField, browser->version());
       std::string browser_id = base::StringPrintf(
           "browser:%s:%s:%s",
           device->serial().c_str(),
           browser->product().c_str(),  // Force sorting by product name.
           browser->socket().c_str());
       browser_data->SetString(kAdbGlobalIdField, browser_id);
+      // Pass the screen dimensions in the browser object as well to make sure

[pfeldman, 2013/09/13 13:38:41]

Please don't.

[Vladislav Kaznacheev, 2013/09/16 10:07:33]

Didn't
On 2013/09/13 13:38:41, pfeldman wrote:

+      // that the caching logic does not prevent page item from updating
+      // when the screen dimensions change.
+      browser_data->SetInteger(kAdbScreenWidthField, device->screenWidth());
+      browser_data->SetInteger(kAdbScreenHeightField, device->screenHeight());
       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(
             kAdbTargetType, page->attached(),
@@ skipping 66 matching lines @@
   base::DictionaryValue default_config;
   default_config.SetString(
       kPortForwardingDefaultPort, kPortForwardingDefaultLocation);
   prefs->Set(prefs::kDevToolsPortForwardingConfig, default_config);
 }
 
 const base::Value* InspectUI::GetPrefValue(const char* name) {
   Profile* profile = Profile::FromWebUI(web_ui());
   return profile->GetPrefs()->FindPreference(name)->GetValue();
 }