Fix Instant suggest issues in Linux Views port.

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

Index: chrome/browser/ui/views/location_bar/location_bar_view.h
diff --git a/chrome/browser/ui/views/location_bar/location_bar_view.h b/chrome/browser/ui/views/location_bar/location_bar_view.h
index 152e6e5e816e53e86033a2282309e924ff83395e..b88d42cb16b90524f52dba7d50cbbca6c641b653 100644
--- a/chrome/browser/ui/views/location_bar/location_bar_view.h
+++ b/chrome/browser/ui/views/location_bar/location_bar_view.h
@@ -42,7 +42,9 @@ 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;
@@ -154,8 +156,10 @@ class LocationBarView : public LocationBar,
   // 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();
@@ -314,8 +318,10 @@ class LocationBarView : public LocationBar,
   // 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_;
@@ -370,9 +376,11 @@ class LocationBarView : public LocationBar,
   // 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_;