DevTools: account for the display scale factor while validating manifest under emulation.

chrome/browser/ui/browser.cc

 // Copyright 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/browser.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 #include <string>
@@ skipping 18 matching lines @@
 #include "base/threading/thread_restrictions.h"
 #include "base/time/time.h"
 #include "build/build_config.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/app_mode/app_mode_utils.h"
 #include "chrome/browser/autofill/personal_data_manager_factory.h"
 #include "chrome/browser/background/background_contents.h"
 #include "chrome/browser/background/background_contents_service.h"
 #include "chrome/browser/background/background_contents_service_factory.h"
 #include "chrome/browser/banners/app_banner_manager_desktop.h"
+#include "chrome/browser/banners/app_banner_manager_emulation.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/browser_shutdown.h"
 #include "chrome/browser/character_encoding.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/content_settings/tab_specific_content_settings.h"
 #include "chrome/browser/custom_handlers/protocol_handler_registry.h"
 #include "chrome/browser/custom_handlers/protocol_handler_registry_factory.h"
 #include "chrome/browser/custom_handlers/register_protocol_handler_permission_request.h"
 #include "chrome/browser/defaults.h"
 #include "chrome/browser/devtools/devtools_toggle_action.h"
@@ skipping 1391 matching lines @@
   Browser* browser = chrome::FindBrowserWithWebContents(
       WebContents::FromRenderFrameHost(frame));
   BubbleReference bubble_reference =
       browser->GetBubbleManager()->ShowBubble(std::move(bubble_controller));
   bubble_controller_ptr->set_bubble_reference(bubble_reference);
 
   return std::move(bluetooth_chooser_desktop);
 }
 
 void Browser::RequestAppBannerFromDevTools(content::WebContents* web_contents) {
-  banners::AppBannerManagerDesktop::CreateForWebContents(web_contents);
-  RequestAppBanner(web_contents);
+  banners::AppBannerManagerEmulation::CreateForWebContents(web_contents);
+  banners::AppBannerManagerEmulation* manager =
+      banners::AppBannerManagerEmulation::FromWebContents(web_contents);
+  manager->RequestAppBanner(web_contents->GetMainFrame(),
+                            web_contents->GetLastCommittedURL(), true);
 }
 
 bool Browser::RequestAppBanner(content::WebContents* web_contents) {

[dominickn, 2016/05/06 18:29:47]

Nit: it looks like this method isn't called from anywhere anymore (except from
ChromeServiceWorkerTest). Can you update that test to call
RequestAppBannerFromDevtools() instead?

[dominickn, 2016/05/06 18:42:38]

Ping?

[pfeldman, 2016/05/06 19:32:05]

I did not realize that. Done.

   banners::AppBannerManagerDesktop* manager =
       banners::AppBannerManagerDesktop::FromWebContents(web_contents);
   if (manager) {
     manager->RequestAppBanner(web_contents->GetMainFrame(),
                               web_contents->GetLastCommittedURL(), true);
     return true;
   }
 
   web_contents->GetMainFrame()->AddMessageToConsole(
       content::CONSOLE_MESSAGE_LEVEL_DEBUG,
@@ skipping 1280 matching lines @@
   if (contents && !allow_js_access) {
     contents->web_contents()->GetController().LoadURL(
         target_url,
         content::Referrer(),
         ui::PAGE_TRANSITION_LINK,
         std::string());  // No extra headers.
   }
 
   return contents != NULL;
 }