Removing defunct code around PureViews.

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 61 matching lines @@
 
 namespace {
 
 WebContents* GetWebContentsFromDelegate(LocationBarView::Delegate* delegate) {
   const TabContentsWrapper* wrapper = delegate->GetTabContentsWrapper();
   return wrapper ? wrapper->web_contents() : NULL;
 }
 
 // A utility function to cast OmniboxView to OmniboxViewViews.
 OmniboxViewViews* AsViews(OmniboxView* view) {
-  DCHECK(views::Widget::IsPureViews());
   return static_cast<OmniboxViewViews*>(view);
 }
 
 // Height of the location bar's round corner region.
 // TODO(jamescook): Update all Chrome platforms to use the new art and metrics
 // from Ash, crbug.com/118228
 #if defined(USE_ASH)
 const int kBorderRoundCornerHeight = 5;
 #else
 const int kBorderRoundCornerHeight = 6;
@@ skipping 362 matching lines @@
 }
 
 #if defined(OS_WIN) || defined(USE_AURA)
 void LocationBarView::SetInstantSuggestion(const string16& text,
                                            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_->SetText(text);
-      if (views::Widget::IsPureViews())
-        NOTIMPLEMENTED();
-#if !defined(USE_AURA)
-      else
-        suggested_text_view_->SetFont(GetOmniboxViewWin()->GetFont());
+#if defined(USE_AURA)
+      NOTIMPLEMENTED();
+#else
+      suggested_text_view_->SetFont(GetOmniboxViewWin()->GetFont());
 #endif
       AddChildView(suggested_text_view_);
     } else if (suggested_text_view_->text() != text) {
       suggested_text_view_->SetText(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 {
     return;
   }
 
   Layout();
   SchedulePaint();
 }
 
 string16 LocationBarView::GetInstantSuggestion() const {
   return HasValidSuggestText() ? suggested_text_view_->text() : string16();
 }
 #endif
 
 void LocationBarView::SetLocationEntryFocusable(bool focusable) {
-  if (views::Widget::IsPureViews())
+#if defined(USE_AURA)
     AsViews(location_entry_.get())->SetLocationEntryFocusable(focusable);
-  else
+#else
     set_focusable(focusable);
+#endif
 }
 
 bool LocationBarView::IsLocationEntryFocusableInRootView() const {
-  return views::Widget::IsPureViews() ?
-      AsViews(location_entry_.get())->IsLocationEntryFocusableInRootView() :
-      views::View::IsFocusable();
+#if defined(USE_AURA)
+  return AsViews(location_entry_.get())->IsLocationEntryFocusableInRootView();
+#else
+  return views::View::IsFocusable();
+#endif
 }
 
 gfx::Size LocationBarView::GetPreferredSize() {
   return gfx::Size(0, GetThemeProvider()->GetBitmapNamed(mode_ == POPUP ?
       IDR_LOCATIONBG_POPUPMODE_CENTER : IDR_LOCATIONBG_C)->height());
 }
 
 void LocationBarView::Layout() {
   if (!location_entry_.get())
     return;
@@ skipping 201 matching lines @@
   // 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 (views::Widget::IsPureViews()) {
-      NOTIMPLEMENTED();
+#if defined(USE_AURA)
+    NOTIMPLEMENTED();
+#else
+    // TODO(sky): need to layout when the user changes caret position.
+    int suggested_text_width =
+        suggested_text_view_->GetPreferredSize().width();
+    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 {
-#if !defined(USE_AURA)
-      // TODO(sky): need to layout when the user changes caret position.
-      int suggested_text_width =
-          suggested_text_view_->GetPreferredSize().width();
-      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,
-                                        location_bounds.y(),
-                                        suggested_text_width,
-                                        location_bounds.height());
-      }
+      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,
+                                      location_bounds.y(),
+                                      suggested_text_width,
+                                      location_bounds.height());
+    }
 #endif
-    }
   }
 #endif
 
   location_entry_view_->SetBoundsRect(location_bounds);
 }
 
 void LocationBarView::OnPaint(gfx::Canvas* canvas) {
   View::OnPaint(canvas);
 
   if (painter_.get()) {
@@ skipping 90 matching lines @@
   } else if (event.IsRightMouseButton()) {
     msg = WM_RBUTTONUP;
   } else {
     NOTREACHED();
     return;
   }
   OnMouseEvent(event, msg);
 }
 
 void LocationBarView::OnMouseCaptureLost() {
-  if (views::Widget::IsPureViews())
-    NOTIMPLEMENTED();
-  else
-    GetOmniboxViewWin()->HandleExternalMsg(WM_CAPTURECHANGED, 0, CPoint());
+  GetOmniboxViewWin()->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 178 matching lines @@
       }
     }
   }
 }
 
 #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);
-  if (views::Widget::IsPureViews())
-    NOTIMPLEMENTED();
-  else
-    GetOmniboxViewWin()->HandleExternalMsg(msg, flags, screen_point.ToPOINT());
+  GetOmniboxViewWin()->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 14 matching lines @@
       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;
   }
 
-#if !defined(USE_AURA)
-  if (!views::Widget::IsPureViews())
-    return GetOmniboxViewWin()->SkipDefaultKeyEventProcessing(event);
-#endif
+#if defined(USE_AURA)
   NOTIMPLEMENTED();
   return false;
 #else
+  return GetOmniboxViewWin()->SkipDefaultKeyEventProcessing(event);
+#endif
+
+#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();
@@ skipping 177 matching lines @@
 }
 
 #if defined(OS_WIN) || defined(USE_AURA)
 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() {
-  CHECK(!views::Widget::IsPureViews());
   return static_cast<OmniboxViewWin*>(location_entry_.get());
 }
 #endif
 #endif