Refactor AutocompleteEditViewGtk so that AutocompleteEditView impl can be swapped.

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

 // Copyright (c) 2010 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.
 
 #ifndef CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_LOCATION_BAR_VIEW_H_
 #define CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_LOCATION_BAR_VIEW_H_
 #pragma once
 
 #include <string>
 #include <vector>
 
 #include "base/task.h"
 #include "chrome/browser/autocomplete/autocomplete_edit.h"
 #include "chrome/browser/extensions/extension_context_menu_model.h"
 #include "chrome/browser/first_run/first_run.h"
 #include "chrome/browser/search_engines/template_url_model_observer.h"
 #include "chrome/browser/ui/omnibox/location_bar.h"
 #include "chrome/browser/ui/toolbar/toolbar_model.h"
 #include "chrome/browser/views/extensions/extension_popup.h"
 #include "chrome/common/notification_observer.h"
 #include "chrome/common/notification_registrar.h"
 #include "gfx/font.h"
 #include "gfx/rect.h"
 #include "views/controls/native/native_view_host.h"
 
 #if defined(OS_WIN)
 #include "chrome/browser/autocomplete/autocomplete_edit_view_win.h"
-#else
+#elif defined(OS_LINUX)
 #include "chrome/browser/autocomplete/autocomplete_edit_view_gtk.h"
-#include "chrome/browser/gtk/accessible_widget_helper_gtk.h"
 #endif
 
 class CommandUpdater;
 class ContentSettingImageView;
 class EVBubbleView;
 class ExtensionAction;
 class GURL;
 class InstantController;
 class KeywordHintView;
 class LocationIconView;
 class PageActionWithBadgeView;
 class Profile;
 class SelectedKeywordView;
 class StarView;
 class TabContents;
 class TabContentsWrapper;
 class TemplateURLModel;
 
+#if defined(OS_WIN)

[Peter Kasting, 2011/01/06 02:06:48]

Nit: Leave this section where it was (Chrome convention is to put #if XXX
declarations below all others).

[oshima, 2011/01/06 19:43:35]

Done.

+class SuggestedTextView;
+#endif
+
 namespace views {
 class HorizontalPainter;
 class Label;
 };
 
-#if defined(OS_WIN)
-class SuggestedTextView;
-#endif
-
 /////////////////////////////////////////////////////////////////////////////
 //
 // LocationBarView class
 //
 //   The LocationBarView class is a View subclass that paints the background
 //   of the URL bar strip and contains its content.
 //
 /////////////////////////////////////////////////////////////////////////////
 class LocationBarView : public LocationBar,
                         public LocationBarTesting,
@@ skipping 240 matching lines @@
   // Update the views for the Page Actions, to reflect state changes for
   // PageActions.
   void RefreshPageActionViews();
 
   // Sets the visibility of view to new_vis.
   void ToggleVisibility(bool new_vis, views::View* view);
 
 #if defined(OS_WIN)
   // Helper for the Mouse event handlers that does all the real work.
   void OnMouseEvent(const views::MouseEvent& event, UINT msg);
+#endif
 
   // Returns true if the suggest text is valid.
   bool HasValidSuggestText();
-#endif
 
   // Helper to show the first run info bubble.
   void ShowFirstRunBubbleInternal(FirstRun::BubbleType bubble_type);
 
   // Current profile. Not owned by us.
   Profile* profile_;
 
   // The Autocomplete Edit field.
 #if defined(OS_WIN)
   scoped_ptr<AutocompleteEditViewWin> location_entry_;
 #else
-  scoped_ptr<AutocompleteEditViewGtk> location_entry_;
+  scoped_ptr<AutocompleteEditView> location_entry_;
 #endif
 
   // The CommandUpdater for the Browser object that corresponds to this View.
   CommandUpdater* command_updater_;
 
   // The model.
   ToolbarModel* model_;
 
   // Our delegate.
   Delegate* delegate_;
@@ skipping 13 matching lines @@
 
   // An object used to paint the normal-mode background.
   scoped_ptr<views::HorizontalPainter> painter_;
 
   // An icon to the left of the edit field.
   LocationIconView* location_icon_view_;
 
   // A bubble displayed for EV HTTPS sites.
   EVBubbleView* ev_bubble_view_;
 
-  // Location_entry view wrapper
-  views::NativeViewHost* location_entry_view_;
+  // Location_entry view
+  views::View* location_entry_view_;
 
   // The following views are used to provide hints and remind the user as to
   // what is going in the edit. They are all added a children of the
   // LocationBarView. At most one is visible at a time. Preference is
   // given to the keyword_view_, then hint_view_.
   // These autocollapse when the edit needs the room.
 
   // Shown if the user has selected a keyword.
   SelectedKeywordView* selected_keyword_view_;
 
@@ skipping 23 matching lines @@
   bool show_focus_rect_;
 
   // Whether bubble text is short or long.
   FirstRun::BubbleType bubble_type_;
 
   // This is in case we're destroyed before the model loads. We store the model
   // because calling profile_->GetTemplateURLModel() in the destructor causes a
   // crash.
   TemplateURLModel* template_url_model_;
 
-#if defined(OS_LINUX)
-  scoped_ptr<AccessibleWidgetHelper> accessible_widget_helper_;
-#endif
-
   // Should instant be updated? This is set to false in OnAutocompleteWillAccept
   // and true in OnAutocompleteAccept. This is needed as prior to accepting an
   // autocomplete suggestion the model is reverted which triggers resetting
   // instant.
   bool update_instant_;
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(LocationBarView);
 };
 
 #endif  // CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_LOCATION_BAR_VIEW_H_