Use OmniboxViewViews on Win with --enable-views-textfield.

chrome/browser/ui/views/location_bar/location_bar_view.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/views/location_bar/location_bar_view.h"
 
 #include <algorithm>
 #include <map>
 
 #include "base/command_line.h"
@@ skipping 25 matching lines @@
 #include "chrome/browser/ui/views/location_bar/chrome_to_mobile_view.h"
 #include "chrome/browser/ui/views/location_bar/content_setting_image_view.h"
 #include "chrome/browser/ui/views/location_bar/ev_bubble_view.h"
 #include "chrome/browser/ui/views/location_bar/keyword_hint_view.h"
 #include "chrome/browser/ui/views/location_bar/location_icon_view.h"
 #include "chrome/browser/ui/views/location_bar/page_action_image_view.h"
 #include "chrome/browser/ui/views/location_bar/page_action_with_badge_view.h"
 #include "chrome/browser/ui/views/location_bar/selected_keyword_view.h"
 #include "chrome/browser/ui/views/location_bar/star_view.h"
 #include "chrome/browser/ui/views/location_bar/suggested_text_view.h"
+#include "chrome/browser/ui/views/omnibox/omnibox_views.h"
 #include "chrome/browser/ui/views/omnibox/omnibox_view_views.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/extensions/extension_switch_utils.h"
 #include "chrome/common/pref_names.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/render_widget_host_view.h"
 #include "content/public/browser/web_contents.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "grit/theme_resources_standard.h"
 #include "ui/base/accessibility/accessible_view_state.h"
 #include "ui/base/dragdrop/drag_drop_types.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/layout.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/theme_provider.h"
+#include "ui/base/ui_base_switches.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/color_utils.h"
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/skia_util.h"
 #include "ui/views/button_drag_utils.h"
 #include "ui/views/controls/label.h"
 
+#if defined(OS_WIN) && !defined(USE_AURA)
+#include "chrome/browser/ui/views/omnibox/omnibox_view_win.h"
+#endif
+
 #if !defined(OS_CHROMEOS)
 #include "chrome/browser/ui/views/first_run_bubble.h"
 #endif
 
-
 using content::WebContents;
 using views::View;
 
 namespace {
 
 WebContents* GetWebContentsFromDelegate(LocationBarView::Delegate* delegate) {
   const TabContents* tab_contents = delegate->GetTabContents();
   return tab_contents ? tab_contents->web_contents() : NULL;
 }
 
-// A utility function to cast OmniboxView to OmniboxViewViews.
-OmniboxViewViews* AsViews(OmniboxView* view) {
-  return static_cast<OmniboxViewViews*>(view);
+bool UseOmniboxViews() {
+#if defined(OS_WIN) && !defined(USE_AURA)
+  CommandLine* command_line = CommandLine::ForCurrentProcess();

[sky, 2012/06/14 23:04:46]

This code is called alot, should we cache the result?

[msw, 2012/06/15 00:19:28]

I've added class members |use_omnibox_view_views_| and GetOmniboxView[Views|Win]
(with a const Views version for
LocationBarView::IsLocationEntryFocusableInRootView).

I'm also amenable to other approaches for caching (static bool in static local
function?) as well as const handling (casting in caller, calling the const
member function from non-const with casting, or evilly returning non-const ptrs
from const  GetOmniboxView[Views|Win] functions, etc.)... thoughts?

+  return command_line->HasSwitch(switches::kEnableViewsTextfield);
+#endif
+  return true;
 }
 
+// Return |view| as an OmniboxViewViews, or NULL if it is of a different type.
+OmniboxViewViews* GetOmniboxViewViews(OmniboxView* view) {
+  return UseOmniboxViews() ? static_cast<OmniboxViewViews*>(view) : NULL;
+}
+
+#if defined(OS_WIN) && !defined(USE_AURA)
+// Return |view| as an OmniboxViewWin, or NULL if it is of a different type.
+OmniboxViewWin* GetOmniboxViewWin(OmniboxView* view) {
+  return UseOmniboxViews() ? NULL : static_cast<OmniboxViewWin*>(view);
+}
+#endif
+
 // Height of the location bar's round corner region.
 const int kBorderRoundCornerHeight = 5;
 // Width of location bar's round corner region.
 const int kBorderRoundCornerWidth = 4;
 // Radius of the round corners inside the location bar.
 const int kBorderCornerRadius = 2;
 
 const int kDesktopItemPadding = 3;
 const int kDesktopEdgeItemPadding = kDesktopItemPadding;
 
@@ skipping 92 matching lines @@
 
   ev_bubble_view_ =
       new EVBubbleView(kEVBubbleBackgroundImages, IDR_OMNIBOX_HTTPS_VALID,
                        GetColor(ToolbarModel::EV_SECURE, SECURITY_TEXT), this);
   AddChildView(ev_bubble_view_);
   ev_bubble_view_->SetVisible(false);
   ev_bubble_view_->set_drag_controller(this);
 
   // URL edit field.
   // View container for URL edit field.
-  location_entry_.reset(OmniboxView::CreateOmniboxView(
-      this,
-      model_,
-      profile_,
-      command_updater_,
-      mode_ == POPUP,
-      this));
+  location_entry_.reset(CreateOmniboxView(this, model_, profile_,
+      command_updater_, mode_ == POPUP, this));
   SetLocationEntryFocusable(true);
 
   location_entry_view_ = location_entry_->AddToView(this);
   location_entry_view_->set_id(VIEW_ID_AUTOCOMPLETE);
 
   selected_keyword_view_ = new SelectedKeywordView(
       kSelectedKeywordBackgroundImages, IDR_KEYWORD_SEARCH_MAGNIFIER,
       GetColor(ToolbarModel::NONE, TEXT), profile_);
   AddChildView(selected_keyword_view_);
   selected_keyword_view_->SetFont(font_);
@@ skipping 266 matching lines @@
 
   Layout();
   SchedulePaint();
 }
 
 string16 LocationBarView::GetInstantSuggestion() const {
   return HasValidSuggestText() ? suggested_text_view_->text() : string16();
 }
 
 void LocationBarView::SetLocationEntryFocusable(bool focusable) {
-#if defined(USE_AURA)
-    AsViews(location_entry_.get())->SetLocationEntryFocusable(focusable);
-#else
+  OmniboxViewViews* omnibox_views = GetOmniboxViewViews(location_entry_.get());
+  if (omnibox_views)
+    omnibox_views->SetLocationEntryFocusable(focusable);
+  else
     set_focusable(focusable);
-#endif
 }
 
 bool LocationBarView::IsLocationEntryFocusableInRootView() const {
-#if defined(USE_AURA)
-  return AsViews(location_entry_.get())->IsLocationEntryFocusableInRootView();
-#else
+  OmniboxViewViews* omnibox_views = GetOmniboxViewViews(location_entry_.get());
+  if (omnibox_views)
+    return omnibox_views->IsLocationEntryFocusableInRootView();
   return views::View::IsFocusable();
-#endif
 }
 
 gfx::Size LocationBarView::GetPreferredSize() {
   return gfx::Size(0, GetThemeProvider()->GetImageSkiaNamed(mode_ == POPUP ?
       IDR_LOCATIONBG_POPUPMODE_CENTER : IDR_LOCATIONBG_C)->height());
 }
 
 void LocationBarView::Layout() {
   if (!location_entry_.get())
     return;
@@ skipping 340 matching lines @@
   } else if (event.IsRightMouseButton()) {
     msg = WM_RBUTTONUP;
   } else {
     NOTREACHED();
     return;
   }
   OnMouseEvent(event, msg);
 }
 
 void LocationBarView::OnMouseCaptureLost() {
-  GetOmniboxViewWin()->HandleExternalMsg(WM_CAPTURECHANGED, 0, CPoint());
+  OmniboxViewWin* omnibox_win = GetOmniboxViewWin(location_entry_.get());
+  if (omnibox_win)
+    omnibox_win->HandleExternalMsg(WM_CAPTURECHANGED, 0, CPoint());
 }
 #endif
 
 void LocationBarView::OnAutocompleteAccept(
     const GURL& url,
     WindowOpenDisposition disposition,
     content::PageTransition transition,
     const GURL& alternate_nav_url) {
   // WARNING: don't add an early return here. The calls after the if must
   // happen.
@@ skipping 174 matching lines @@
             chrome::NOTIFICATION_EXTENSION_PAGE_ACTION_VISIBILITY_CHANGED,
             content::Source<ExtensionAction>(action),
             content::Details<WebContents>(contents));
       }
     }
   }
 }
 
 #if defined(OS_WIN) && !defined(USE_AURA)
 void LocationBarView::OnMouseEvent(const views::MouseEvent& event, UINT msg) {
-  UINT flags = event.native_event().wParam;
-  gfx::Point screen_point(event.location());
-  ConvertPointToScreen(this, &screen_point);
-  GetOmniboxViewWin()->HandleExternalMsg(msg, flags, screen_point.ToPOINT());
+  OmniboxViewWin* omnibox_win = GetOmniboxViewWin(location_entry_.get());
+  if (omnibox_win) {
+    UINT flags = event.native_event().wParam;
+    gfx::Point screen_point(event.location());
+    ConvertPointToScreen(this, &screen_point);
+    omnibox_win->HandleExternalMsg(msg, flags, screen_point.ToPOINT());
+  }
 }
 #endif
 
 void LocationBarView::ShowFirstRunBubbleInternal() {
 #if !defined(OS_CHROMEOS)
   // First run bubble doesn't make sense for Chrome OS.
   FirstRunBubble::ShowBubble(profile_, location_icon_view_);
 #endif
 }
 
@@ skipping 43 matching lines @@
     // Return true so that focus traversal isn't attempted. The edit ends
     // up doing nothing in this case.
     if (location_entry_->model()->AcceptCurrentInstantPreview())
       return true;
   }
 
 #if defined(USE_AURA)
   NOTIMPLEMENTED();
   return false;
 #else
-  return GetOmniboxViewWin()->SkipDefaultKeyEventProcessing(event);
-#endif
+  OmniboxViewWin* omnibox_win = GetOmniboxViewWin(location_entry_.get());
+  if (omnibox_win)
+    return omnibox_win->SkipDefaultKeyEventProcessing(event);
+#endif  // USE_AURA
+#endif  // OS_WIN
 
-#else
   // This method is not used for Linux ports. See FocusManager::OnKeyEvent() in
   // src/ui/views/focus/focus_manager.cc for details.
   return false;
-#endif
 }
 
 void LocationBarView::GetAccessibleState(ui::AccessibleViewState* state) {
   state->role = ui::AccessibilityTypes::ROLE_LOCATION_BAR;
   state->name = l10n_util::GetStringUTF16(IDS_ACCNAME_LOCATION);
   state->value = location_entry_->GetText();
 
   string16::size_type entry_start;
   string16::size_type entry_end;
   location_entry_->GetSelectionBounds(&entry_start, &entry_end);
@@ skipping 188 matching lines @@
 int LocationBarView::GetInternalHeight(bool use_preferred_size) {
   int total_height =
       use_preferred_size ? GetPreferredSize().height() : height();
   return std::max(total_height - (kVerticalEdgeThickness * 2), 0);
 }
 
 bool LocationBarView::HasValidSuggestText() const {
   return suggested_text_view_ && !suggested_text_view_->size().IsEmpty() &&
       !suggested_text_view_->text().empty();
 }
-
-#if !defined(USE_AURA)
-OmniboxViewWin* LocationBarView::GetOmniboxViewWin() {
-  return static_cast<OmniboxViewWin*>(location_entry_.get());
-}
-#endif