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

Unified Diff: ui/views/bubble/bubble_delegate.h

Issue 9317111: Fix views compilation on Linux with toolkit_views=1. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 10 months 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/bubble/bubble_delegate.h
diff --git a/ui/views/bubble/bubble_delegate.h b/ui/views/bubble/bubble_delegate.h
index 81fd9c84208953e86de88ff9de7e58f46fe5fc80..c7f55642650da135c857cf932c62f69219c8d820 100644
--- a/ui/views/bubble/bubble_delegate.h
+++ b/ui/views/bubble/bubble_delegate.h
@@ -72,8 +72,8 @@ class VIEWS_EXPORT BubbleDelegateView : public WidgetDelegateView,
int margin() const { return margin_; }
void set_margin(int margin) { margin_ = margin; }
- gfx::NativeWindow parent_window() const { return parent_window_; }
- void set_parent_window(gfx::NativeWindow window) { parent_window_ = window; }
+ gfx::NativeView parent_window() const { return parent_window_; }
+ void set_parent_window(gfx::NativeView window) { parent_window_ = window; }
bool use_focusless() const { return use_focusless_; }
void set_use_focusless(bool use_focusless) {
@@ -156,7 +156,7 @@ class VIEWS_EXPORT BubbleDelegateView : public WidgetDelegateView,
bool use_focusless_;
// Parent native window of the bubble.
- gfx::NativeWindow parent_window_;
+ gfx::NativeView parent_window_;
DISALLOW_COPY_AND_ASSIGN(BubbleDelegateView);
};
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698