Fix Instant suggest issues in Linux Views port.

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>
@@ skipping 24 matching lines @@
 class EVBubbleView;
 class ExtensionAction;
 class GURL;
 class InstantController;
 class KeywordHintView;
 class LocationIconView;
 class PageActionWithBadgeView;
 class Profile;
 class SelectedKeywordView;
 class StarView;
+#if defined(OS_WIN)

[sky, 2010/12/13 17:27:33]

Move conditional forward declarations after non-conditional forward
declarations.

 class SuggestedTextView;
+#endif
 class TabContents;
 class TabContentsWrapper;
 class TemplateURLModel;
 
 namespace views {
 class HorizontalPainter;
 class Label;
 };
 
 /////////////////////////////////////////////////////////////////////////////
@@ skipping 91 matching lines @@
   // Toggles the star on or off.
   void SetStarToggled(bool on);
 
   // Shows the bookmark bubble.
   void ShowStarBubble(const GURL& url, bool newly_bookmarked);
 
   // Returns the screen coordinates of the location entry (where the URL text
   // appears, not where the icons are shown).
   gfx::Point GetLocationEntryOrigin() const;
 
+#if defined(OS_WIN)
   // Invoked from SuggestedTextView when the suggested text should be committed.
   void OnCommitSuggestedText();
+#endif
 
   // Sizing functions
   virtual gfx::Size GetPreferredSize();
 
   // Layout and Painting functions
   virtual void Layout();
   virtual void Paint(gfx::Canvas* canvas);
 
   // No focus border for the location bar, the caret is enough.
   virtual void PaintFocusBorder(gfx::Canvas* canvas) { }
@@ skipping 138 matching lines @@
   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
 
   // Helper to show the first run info bubble.
   void ShowFirstRunBubbleInternal(FirstRun::BubbleType bubble_type);
 
+#if defined(OS_WIN)
   // Returns true if the suggest text is valid.
   bool HasValidSuggestText();

[sky, 2010/12/13 17:27:33]

Move this to around line 315 so that you have one less ifdef

+#endif
 
   // 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_;
 #endif
@@ skipping 34 matching lines @@
 
   // 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_;
 
+#if defined(OS_WIN)
   // View responsible for showing suggested text. This is NULL when there is no
   // suggested text.
   SuggestedTextView* suggested_text_view_;
+#endif
 
   // Shown if the selected url has a corresponding keyword.
   KeywordHintView* keyword_hint_view_;
 
   // The content setting views.
   ContentSettingViews content_setting_views_;
 
   // The page action icon views.
   PageActionViews page_action_views_;
 
@@ skipping 22 matching lines @@
   // 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_