Get chrome to link with USE_AURA

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 410 matching lines @@
   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));
       if (views::Widget::IsPureViews())
         NOTIMPLEMENTED();
+#if !defined(USE_AURA)
       else
         suggested_text_view_->SetFont(GetOmniboxViewWin()->GetFont());
+#endif
       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 95 matching lines @@
     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)
   int max_edit_width = entry_width;
   if (views::Widget::IsPureViews()) {
     NOTIMPLEMENTED();
   } else {
+#if !defined(USE_AURA)
     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);
+#endif
   }
 #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;
@@ skipping 103 matching lines @@
   // 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();
     } 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());
       }
+#endif
     }
   }
 #endif
 
   location_entry_view_->SetBoundsRect(location_bounds);
 }
 
 void LocationBarView::OnPaint(gfx::Canvas* canvas) {
   View::OnPaint(canvas);
 
@@ skipping 45 matching lines @@
 
 void LocationBarView::SetShowFocusRect(bool show) {
   show_focus_rect_ = show;
   SchedulePaint();
 }
 
 void LocationBarView::SelectAll() {
   location_entry_->SelectAll(true);
 }
 
-#if defined(OS_WIN)
+#if defined(OS_WIN) && !defined(USE_AURA)
 bool LocationBarView::OnMousePressed(const views::MouseEvent& event) {
   UINT msg;
   if (event.IsLeftMouseButton()) {
     msg = (event.flags() & ui::EF_IS_DOUBLE_CLICK) ?
         WM_LBUTTONDBLCLK : WM_LBUTTONDOWN;
   } else if (event.IsMiddleMouseButton()) {
     msg = (event.flags() & ui::EF_IS_DOUBLE_CLICK) ?
         WM_MBUTTONDBLCLK : WM_MBUTTONDOWN;
   } else if (event.IsRightMouseButton()) {
     msg = (event.flags() & ui::EF_IS_DOUBLE_CLICK) ?
@@ skipping 211 matching lines @@
           old_visibility[action] != (*i)->IsVisible()) {
         NotificationService::current()->Notify(
             chrome::NOTIFICATION_EXTENSION_PAGE_ACTION_VISIBILITY_CHANGED,
             Source<ExtensionAction>(action),
             Details<TabContents>(contents));
       }
     }
   }
 }
 
-#if defined(OS_WIN)
+#if defined(OS_WIN) && !defined(USE_AURA)
 void LocationBarView::OnMouseEvent(const views::MouseEvent& event, UINT msg) {
   UINT flags = event.GetWindowsFlags();
   gfx::Point screen_point(event.location());
   ConvertPointToScreen(this, &screen_point);
   if (views::Widget::IsPureViews())
     NOTIMPLEMENTED();
   else
     GetOmniboxViewWin()->HandleExternalMsg(msg, flags, screen_point.ToPOINT());
 }
 #endif
@@ skipping 31 matching lines @@
   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 !defined(USE_AURA)
     // If the caret is not at the end, then tab moves the caret to the end.
     if (!views_omnibox && !GetOmniboxViewWin()->IsCaretAtEnd())
       return true;
+#endif
 
     // 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_omnibox)
     return GetOmniboxViewWin()->SkipDefaultKeyEventProcessing(event);
+#endif
   NOTIMPLEMENTED();
   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) {
@@ skipping 179 matching lines @@
       Update(NULL);
   }
 }
 
 #if defined(OS_WIN)
 bool LocationBarView::HasValidSuggestText() const {
   return suggested_text_view_ && !suggested_text_view_->size().IsEmpty() &&
       !suggested_text_view_->GetText().empty();
 }
 
+#if !defined(USE_AURA)
 OmniboxViewWin* LocationBarView::GetOmniboxViewWin() {
   CHECK(!views::Widget::IsPureViews());
   return static_cast<OmniboxViewWin*>(location_entry_.get());
 }
 #endif
+#endif