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

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

Issue 8528009: Renaming bubble_window.cc to bubble_window_gtk.cc (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Created 9 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
« no previous file with comments | « chrome/browser/chromeos/frame/bubble_window.cc ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/frame/bubble_window_gtk.cc
diff --git a/chrome/browser/chromeos/frame/bubble_window.cc b/chrome/browser/chromeos/frame/bubble_window_gtk.cc
similarity index 73%
rename from chrome/browser/chromeos/frame/bubble_window.cc
rename to chrome/browser/chromeos/frame/bubble_window_gtk.cc
index a7dce375d81a8b65f24ac77b4fc7e4a5d1d2b316..9e7ff93c4767823773608db11cdfe5aca44958ba 100644
--- a/chrome/browser/chromeos/frame/bubble_window.cc
+++ b/chrome/browser/chromeos/frame/bubble_window_gtk.cc
@@ -20,9 +20,6 @@ BubbleWindow::BubbleWindow(views::Widget* window,
}
void BubbleWindow::InitNativeWidget(const views::Widget::InitParams& params) {
-#if defined(USE_AURA)
- // TODO(saintlou): Switch to alicet@chromium.org PureView when landed
-#else
views::NativeWidgetGtk::InitNativeWidget(params);
// Turn on double buffering so that the hosted GtkWidgets does not
@@ -42,7 +39,6 @@ void BubbleWindow::InitNativeWidget(const views::Widget::InitParams& params) {
gdk_window_set_back_pixmap(GetNativeView()->window, NULL, FALSE);
gtk_widget_realize(window_contents());
gdk_window_set_back_pixmap(window_contents()->window, NULL, FALSE);
-#endif
}
views::NonClientFrameView* BubbleWindow::CreateNonClientFrameView() {
@@ -54,26 +50,6 @@ views::Widget* BubbleWindow::Create(
gfx::NativeWindow parent,
BubbleWindowStyle style,
views::WidgetDelegate* widget_delegate) {
-#if defined(USE_AURA)
- // TODO(saintlou):
- return NULL;
-#else
- // TODO(saintlou): Ultimately we do not want 2 classes for BubbleWindows.
- // Furthermore the 2 other styles (STYLE_XBAR & STYLE_THROBBER) are only used
- // in LoginHtmlDialog::Show() which will be deprecated soon.
- if (views::Widget::IsPureViews()) {
- if ((style & STYLE_XBAR) || (style & STYLE_THROBBER))
- NOTIMPLEMENTED();
- BubbleWindowViews* window = new BubbleWindowViews(style);
- views::Widget::InitParams params;
- params.delegate = widget_delegate;
- params.parent = GTK_WIDGET(parent);
- params.bounds = gfx::Rect();
- window->Init(params);
- window->SetBackgroundColor();
- return window;
- }
-
views::Widget* window = new views::Widget;
BubbleWindow* bubble_window = new BubbleWindow(window, style);
views::Widget::InitParams params;
@@ -84,7 +60,6 @@ views::Widget* BubbleWindow::Create(
window->Init(params);
return window;
-#endif
}
} // namespace chromeos
« no previous file with comments | « chrome/browser/chromeos/frame/bubble_window.cc ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698