Add an option to run Chrome in the views desktop.

chrome/browser/ui/views/location_bar/location_bar_view.cc

 // Copyright (c) 2011 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"
 
 #if defined(TOOLKIT_USES_GTK)
 #include <gtk/gtk.h>
 #endif
 
@@ skipping 17 matching lines @@
 #include "chrome/browser/ui/view_ids.h"
 #include "chrome/browser/ui/views/browser_dialogs.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/omnibox/omnibox_view_views.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "content/browser/renderer_host/render_widget_host_view.h"
 #include "content/common/notification_service.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/resource/resource_bundle.h"
 #include "ui/base/theme_provider.h"
 #include "ui/gfx/canvas_skia.h"
 #include "ui/gfx/color_utils.h"
 #include "ui/gfx/skia_util.h"
 #include "views/controls/label.h"
+#include "views/controls/textfield/native_textfield_views.h"
 #include "views/drag_utils.h"
 
 #if defined(OS_WIN)
 #include "chrome/browser/ui/views/first_run_bubble.h"
 #include "chrome/browser/ui/views/location_bar/suggested_text_view.h"
 #endif
 
 using views::View;
 
 namespace {
@@ skipping 100 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_->SetDragController(this);
 
   // URL edit field.
   // View container for URL edit field.
 #if defined(OS_WIN)
-  location_entry_.reset(new OmniboxViewWin(font_, this, model_, this,
-      GetWidget()->GetNativeView(), profile_, browser_->command_updater(),
-      mode_ == POPUP, this));
+  if (UseViewsOmnibox()) {
+    OmniboxViewViews* omnibox_view =
+        new OmniboxViewViews(this, model_, profile_,
+                             browser_->command_updater(), mode_ == POPUP, this);
+    omnibox_view->Init();
+    location_entry_.reset(omnibox_view);
+  } else {
+    location_entry_.reset(new OmniboxViewWin(font_, this, model_, this,
+        GetWidget()->GetNativeView(), profile_, browser_->command_updater(),
+        mode_ == POPUP, this));
+  }
 #else
   location_entry_.reset(OmniboxViewGtk::Create(this, model_, profile_,
       browser_->command_updater(), mode_ == POPUP, this));
 #endif
 
   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,
@@ skipping 227 matching lines @@
                                            bool animate_to_complete) {
   // Don't show the suggested text if inline autocomplete is prevented.
   if (!text.empty()) {
     if (!suggested_text_view_) {
       suggested_text_view_ = new SuggestedTextView(location_entry_->model());
       suggested_text_view_->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
       suggested_text_view_->SetColor(
           GetColor(ToolbarModel::NONE,
                    LocationBarView::DEEMPHASIZED_TEXT));
       suggested_text_view_->SetText(UTF16ToWide(text));
-      suggested_text_view_->SetFont(location_entry_->GetFont());
+      if (!UseViewsOmnibox())
+        suggested_text_view_->SetFont(GetOmniboxViewWin()->GetFont());
       AddChildView(suggested_text_view_);
     } else if (suggested_text_view_->GetText() != UTF16ToWide(text)) {
       suggested_text_view_->SetText(UTF16ToWide(text));
     }
     if (animate_to_complete && !location_entry_->IsImeComposing())
       suggested_text_view_->StartAnimation();
   } else if (suggested_text_view_) {
     delete suggested_text_view_;
     suggested_text_view_ = NULL;
   } else {
@@ skipping 91 matching lines @@
     static const int kMinElidedBubbleWidth = 150;
     static const double kMaxBubbleFraction = 0.5;
     const int total_padding =
         kEdgeThickness + kBubbleHorizontalPadding + kItemEditPadding;
     ev_bubble_width = std::min(ev_bubble_width, std::max(kMinElidedBubbleWidth,
         static_cast<int>((entry_width - total_padding) * kMaxBubbleFraction)));
     entry_width -= (total_padding + ev_bubble_width);
   }
 
 #if defined(OS_WIN)
-  RECT formatting_rect;
-  location_entry_->GetRect(&formatting_rect);
-  RECT edit_bounds;
-  location_entry_->GetClientRect(&edit_bounds);
-  int max_edit_width = entry_width - formatting_rect.left -
-                       (edit_bounds.right - formatting_rect.right);
+  int max_edit_width = entry_width;
+  if (!UseViewsOmnibox()) {
+    RECT formatting_rect;
+    GetOmniboxViewWin()->GetRect(&formatting_rect);
+    RECT edit_bounds;
+    GetOmniboxViewWin()->GetClientRect(&edit_bounds);
+    max_edit_width = entry_width - formatting_rect.left -
+                     (edit_bounds.right - formatting_rect.right);
+  }
 #else
   int max_edit_width = entry_width;
 #endif
 
   if (max_edit_width < 0)
     return;
   const int available_width = AvailableWidth(max_edit_width);
 
   const bool show_keyword_hint = !keyword.empty() && is_keyword_hint;
   selected_keyword_view_->SetVisible(show_selected_keyword);
@@ skipping 97 matching lines @@
   // Layout out the suggested text view right aligned to the location
   // entry. Only show the suggested text if we can fit the text from one
   // character before the end of the selection to the end of the text and the
   // suggested text. If we can't it means either the suggested text is too big,
   // or the user has scrolled.
 
   // TODO(sky): We could potentially combine this with the previous step to
   // force using minimum size if necessary, but currently the chance of showing
   // keyword hints and suggested text is minimal and we're not confident this
   // is the right approach for suggested text.
-  if (suggested_text_view_) {
+  if (suggested_text_view_ && !UseViewsOmnibox()) {

[sky, 2011/06/21 21:52:11]

Do we need a NOTIMPLEMENTED for the UseViewsOmnibox case?

     // TODO(sky): need to layout when the user changes caret position.
     int suggested_text_width = suggested_text_view_->GetPreferredSize().width();
-    int vis_text_width = location_entry_->WidthOfTextAfterCursor();
+    int vis_text_width = GetOmniboxViewWin()->WidthOfTextAfterCursor();
     if (vis_text_width + suggested_text_width > entry_width) {
       // Hide the suggested text if the user has scrolled or we can't fit all
       // the suggested text.
       suggested_text_view_->SetBounds(0, 0, 0, 0);
     } else {
       int location_needed_width = location_entry_->TextWidth();
       location_bounds.set_width(std::min(location_needed_width,
                                          entry_width - suggested_text_width));
       // TODO(sky): figure out why this needs the -1.
       suggested_text_view_->SetBounds(location_bounds.right() - 1,
@@ skipping 98 matching lines @@
   } else if (event.IsRightMouseButton()) {
     msg = WM_RBUTTONUP;
   } else {
     NOTREACHED();
     return;
   }
   OnMouseEvent(event, msg);
 }
 
 void LocationBarView::OnMouseCaptureLost() {
-  location_entry_->HandleExternalMsg(WM_CAPTURECHANGED, 0, CPoint());
+  if (!UseViewsOmnibox())
+    GetOmniboxViewWin()->HandleExternalMsg(WM_CAPTURECHANGED, 0, CPoint());
 }
 #endif
 
 void LocationBarView::OnAutocompleteAccept(
     const GURL& url,
     WindowOpenDisposition disposition,
     PageTransition::Type transition,
     const GURL& alternate_nav_url) {
   // WARNING: don't add an early return here. The calls after the if must
   // happen.
@@ skipping 172 matching lines @@
       }
     }
   }
 }
 
 #if defined(OS_WIN)
 void LocationBarView::OnMouseEvent(const views::MouseEvent& event, UINT msg) {
   UINT flags = event.GetWindowsFlags();
   gfx::Point screen_point(event.location());
   ConvertPointToScreen(this, &screen_point);
-  location_entry_->HandleExternalMsg(msg, flags, screen_point.ToPOINT());
+  if (!UseViewsOmnibox())
+    GetOmniboxViewWin()->HandleExternalMsg(msg, flags, screen_point.ToPOINT());
 }
 #endif
 
 void LocationBarView::ShowFirstRunBubbleInternal(
     FirstRun::BubbleType bubble_type) {
 #if defined(OS_WIN)  // First run bubble doesn't make sense for Chrome OS.
   // Point at the start of the edit control; adjust to look as good as possible.
   const int kXOffset = kNormalHorizontalEdgeThickness + kEdgeItemPadding +
       ResourceBundle::GetSharedInstance().GetBitmapNamed(
       IDR_OMNIBOX_HTTP)->width() + kItemPadding;
@@ skipping 11 matching lines @@
 #endif
 }
 
 std::string LocationBarView::GetClassName() const {
   return kViewClassName;
 }
 
 bool LocationBarView::SkipDefaultKeyEventProcessing(
     const views::KeyEvent& event) {
 #if defined(OS_WIN)
+  bool views_omnibox = UseViewsOmnibox();
   if (views::FocusManager::IsTabTraversalKeyEvent(event)) {
     if (HasValidSuggestText()) {
       // Return true so that the edit sees the tab and commits the suggestion.
       return true;
     }
     if (keyword_hint_view_->IsVisible() && !event.IsShiftDown()) {
       // Return true so the edit gets the tab event and enters keyword mode.
       return true;
     }
 
     // If the caret is not at the end, then tab moves the caret to the end.
-    if (!location_entry_->IsCaretAtEnd())
+    if (!views_omnibox && !GetOmniboxViewWin()->IsCaretAtEnd())
       return true;
 
     // Tab while showing instant commits instant immediately.
     // 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;
   }
 
-  return location_entry_->SkipDefaultKeyEventProcessing(event);
+  if (!views_omnibox)
+    return GetOmniboxViewWin()->SkipDefaultKeyEventProcessing(event);
+  return false;
 #else
   // This method is not used for Linux ports. See FocusManager::OnKeyEvent() in
   // src/views/focus/focus_manager.cc for details.
   return false;
 #endif
 }
 
 void LocationBarView::GetAccessibleState(ui::AccessibleViewState* state) {
   state->role = ui::AccessibilityTypes::ROLE_GROUPING;
   state->name = l10n_util::GetStringUTF16(IDS_ACCNAME_LOCATION);
@@ skipping 176 matching lines @@
     if (*name == prefs::kEditBookmarksEnabled)
       Update(NULL);
   }
 }
 
 #if defined(OS_WIN)
 bool LocationBarView::HasValidSuggestText() const {
   return suggested_text_view_ && !suggested_text_view_->size().IsEmpty() &&
       !suggested_text_view_->GetText().empty();
 }
+
+OmniboxViewWin* LocationBarView::GetOmniboxViewWin() {

[oshima, 2011/06/21 22:36:07]

Looks like this shouldn't return NULL.

maybe CHECK/DCHECK(UseViewsOmnibox()) is better?

+  return UseViewsOmnibox() ? NULL :
+      static_cast<OmniboxViewWin*>(location_entry_.get());
+}
+
+// Returns true if the views-based omnibox should be used. When false,

[sky, 2011/06/21 21:52:11]

remove comment as its in the header.

+// |location_entry_| can be cast to OmniboxViewWin.
+// static
+bool LocationBarView::UseViewsOmnibox() {
+  return views::Widget::IsPureViews() ||
+      views::NativeTextfieldViews::IsTextfieldViewsEnabled();
+}
 #endif