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

Unified Diff: chrome/browser/views/autocomplete/autocomplete_popup_contents_view.h

Issue 391011: Avoid inconsistent state (leading to checkfailures) due to Windows minimize/r... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 11 years, 1 month 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/views/autocomplete/autocomplete_popup_contents_view.h
===================================================================
--- chrome/browser/views/autocomplete/autocomplete_popup_contents_view.h (revision 31645)
+++ chrome/browser/views/autocomplete/autocomplete_popup_contents_view.h (working copy)
@@ -87,6 +87,12 @@
virtual void Layout();
private:
+#if defined(OS_WIN)
+ typedef AutocompletePopupWin AutocompletePopupClass;
+#else
+ typedef AutocompletePopupGtk AutocompletePopupClass;
+#endif
+
// Returns true if the model has a match at the specified index.
bool HasMatchAt(size_t index) const;
@@ -103,12 +109,8 @@
// Makes the contents of the canvas slightly transparent.
void MakeCanvasTransparent(gfx::Canvas* canvas);
-#if defined(OS_WIN)
// The popup that contains this view.
- scoped_ptr<AutocompletePopupWin> popup_;
-#else
- scoped_ptr<AutocompletePopupGtk> popup_;
-#endif
+ scoped_ptr<AutocompletePopupClass> popup_;
// The provider of our result set.
scoped_ptr<AutocompletePopupModel> model_;
@@ -132,8 +134,6 @@
gfx::Rect start_bounds_;
gfx::Rect target_bounds_;
- bool is_open_; // Used only for sanity-checking.
-
DISALLOW_COPY_AND_ASSIGN(AutocompletePopupContentsView);
};

Powered by Google App Engine
This is Rietveld 408576698