Set display mode for browser

chrome/browser/ui/browser.cc

Index: chrome/browser/ui/browser.cc
diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc
index 72b0ce39095ed78ee8473b798750e3e460c0f5a4..a93c75dc6bb0f1ea7ba119faf87491d352bf7d29 100644
--- a/chrome/browser/ui/browser.cc
+++ b/chrome/browser/ui/browser.cc
@@ -107,6 +107,7 @@
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/chrome_pages.h"
 #include "chrome/browser/ui/chrome_select_file_policy.h"
+#include "chrome/browser/ui/exclusive_access/exclusive_access_context.h"
 #include "chrome/browser/ui/exclusive_access/fullscreen_controller.h"
 #include "chrome/browser/ui/exclusive_access/mouse_lock_controller.h"
 #include "chrome/browser/ui/extensions/hosted_app_browser_controller.h"
@@ -1734,6 +1735,17 @@ bool Browser::IsFullscreenForTabOrPending(
       ->IsFullscreenForTabOrPending(web_contents);
 }
 
+blink::WebDisplayMode Browser::GetDisplayMode(
+    const WebContents* web_contents) const {
+  if (exclusive_access_manager_->context()->IsFullscreen())

[sky, 2015/09/03 17:57:45]

Actually, one question that is now worth asking (I was tempted before, but it
seemed like they are routed to the same place and it wouldn't matter). Can you
use window_->IsFullscreen(), which I believe is routed to the same place and
shouldn't have the timing issues you ran into?

+    return blink::WebDisplayModeFullscreen;
+
+  if (is_type_popup())
+    return blink::WebDisplayModeStandalone;
+
+  return blink::WebDisplayModeBrowser;
+}
+
 void Browser::RegisterProtocolHandler(WebContents* web_contents,
                                       const std::string& protocol,
                                       const GURL& url,