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

Unified Diff: chrome/browser/chromeos/frame/bubble_window_views.cc

Issue 7566023: Enabled BubbleWindowViews class for the Pure Views case. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merged Created 9 years, 4 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 | « chrome/browser/chromeos/frame/bubble_window_views.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/frame/bubble_window_views.cc
diff --git a/chrome/browser/chromeos/frame/bubble_window_views.cc b/chrome/browser/chromeos/frame/bubble_window_views.cc
index f8c6d44e49bcc51688966bbc94246158cb74a71c..7a2b971e9a6c7e8cc572796824bc4fd1b1a372e4 100644
--- a/chrome/browser/chromeos/frame/bubble_window_views.cc
+++ b/chrome/browser/chromeos/frame/bubble_window_views.cc
@@ -18,30 +18,16 @@ BubbleWindowViews::BubbleWindowViews(BubbleWindowStyle style)
: style_(style) {
}
-views::NonClientFrameView* BubbleWindowViews::CreateNonClientFrameView() {
- return new BubbleFrameView(this, widget_delegate(), style_);
+void BubbleWindowViews::SetBackgroundColor() {
+ // TODO(saintlou): Once Views are truly pure the code below needs to be
+ // removed and replaced by the corresponding Views code.
+ GdkColor background_color =
+ gfx::SkColorToGdkColor(kBubbleWindowBackgroundColor);
+ gtk_widget_modify_bg(GetNativeView(), GTK_STATE_NORMAL, &background_color);
}
-views::Widget* BubbleWindowViews::Create(
- gfx::NativeWindow parent,
- BubbleWindowStyle style,
- views::WidgetDelegate* widget_delegate) {
- BubbleWindowViews* window = new BubbleWindowViews(style);
- views::Widget::InitParams params;
- params.delegate = widget_delegate;
- params.parent = GTK_WIDGET(parent);
- params.bounds = gfx::Rect();
- params.transparent = true;
- window->Init(params);
-
- // TODO(saintlou): After discussions with mazda we concluded that we could
- // punt on an initial implementation of this style which is only used when
- // displaying the keyboard overlay. Once we have implemented gradient and
- // other missing features of Views we can address this.
- if (style == STYLE_XSHAPE)
- NOTIMPLEMENTED();
-
- return window;
+views::NonClientFrameView* BubbleWindowViews::CreateNonClientFrameView() {
+ return new BubbleFrameView(this, widget_delegate(), style_);
}
} // namespace chromeos
« no previous file with comments | « chrome/browser/chromeos/frame/bubble_window_views.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698