Merge 144001 - Update BrowserView::ProcessFullscreen OmniboxViewWin use; etc.

chrome/browser/ui/views/frame/browser_view.cc

Index: chrome/browser/ui/views/frame/browser_view.cc
===================================================================
--- chrome/browser/ui/views/frame/browser_view.cc	(revision 144960)
+++ chrome/browser/ui/views/frame/browser_view.cc	(working copy)
@@ -54,6 +54,7 @@
 #include "chrome/browser/ui/views/fullscreen_exit_bubble_views.h"
 #include "chrome/browser/ui/views/infobars/infobar_container_view.h"
 #include "chrome/browser/ui/views/location_bar/location_icon_view.h"
+#include "chrome/browser/ui/views/omnibox/omnibox_views.h"
 #include "chrome/browser/ui/views/omnibox/omnibox_view_views.h"
 #include "chrome/browser/ui/views/password_generation_bubble_view.h"
 #include "chrome/browser/ui/views/status_bubble_views.h"
@@ -2108,8 +2109,8 @@
   ignore_layout_ = true;
   LocationBarView* location_bar = GetLocationBarView();
 #if defined(OS_WIN) && !defined(USE_AURA)
-  OmniboxViewWin* omnibox_view =
-      static_cast<OmniboxViewWin*>(location_bar->GetLocationEntry());
+  OmniboxViewWin* omnibox_win =
+      GetOmniboxViewWin(location_bar->GetLocationEntry());
 #endif
 
   if (type == FOR_METRO || !fullscreen) {
@@ -2127,13 +2128,15 @@
       focus_manager->ClearFocus();
 
 #if defined(OS_WIN) && !defined(USE_AURA)
-    // If we don't hide the edit and force it to not show until we come out of
-    // fullscreen, then if the user was on the New Tab Page, the edit contents
-    // will appear atop the web contents once we go into fullscreen mode.  This
-    // has something to do with how we move the main window while it's hidden;
-    // if we don't hide the main window below, we don't get this problem.
-    omnibox_view->set_force_hidden(true);
-    ShowWindow(omnibox_view->m_hWnd, SW_HIDE);
+    if (omnibox_win) {
+      // If we don't hide the edit and force it to not show until we come out of
+      // fullscreen, then if the user was on the New Tab Page, the edit contents
+      // will appear atop the web contents once we go into fullscreen mode. This
+      // has something to do with how we move the main window while it's hidden;
+      // if we don't hide the main window below, we don't get this problem.
+      omnibox_win->set_force_hidden(true);
+      ShowWindow(omnibox_win->m_hWnd, SW_HIDE);
+    }
 #endif
   }
 #if defined(OS_WIN) && !defined(USE_AURA)
@@ -2163,9 +2166,11 @@
     }
   } else {
 #if defined(OS_WIN) && !defined(USE_AURA)
-    // Show the edit again since we're no longer in fullscreen mode.
-    omnibox_view->set_force_hidden(false);
-    ShowWindow(omnibox_view->m_hWnd, SW_SHOW);
+    if (omnibox_win) {
+      // Show the edit again since we're no longer in fullscreen mode.
+      omnibox_win->set_force_hidden(false);
+      ShowWindow(omnibox_win->m_hWnd, SW_SHOW);
+    }
 #endif
   }