Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4754)

Unified Diff: chrome/browser/ui/views/location_bar/location_bar_view.h

Issue 5698006: Fix Instant suggest issues in Linux Views port. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Update according to review feedback. Created 10 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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..cfda87428d8cde8e921b895ce58bdc35ecb460b2 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,6 @@ class PageActionWithBadgeView;
class Profile;
class SelectedKeywordView;
class StarView;
-class SuggestedTextView;
class TabContents;
class TabContentsWrapper;
class TemplateURLModel;
@@ -52,6 +51,10 @@ class HorizontalPainter;
class Label;
};
+#if defined(OS_WIN)
+class SuggestedTextView;
+#endif
+
/////////////////////////////////////////////////////////////////////////////
//
// LocationBarView class
@@ -154,8 +157,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();
@@ -309,14 +314,14 @@ class LocationBarView : public LocationBar,
#if defined(OS_WIN)
// Helper for the Mouse event handlers that does all the real work.
void OnMouseEvent(const views::MouseEvent& event, UINT msg);
+
+ // 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);
- // Returns true if the suggest text is valid.
- bool HasValidSuggestText();
-
// Current profile. Not owned by us.
Profile* profile_;
@@ -370,9 +375,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_;
« no previous file with comments | « chrome/browser/autocomplete/autocomplete_edit_view_gtk.cc ('k') | chrome/browser/ui/views/location_bar/location_bar_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698