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

Unified Diff: chrome/browser/chromeos/native_dialog_window.cc

Issue 3538012: Use BubbleWindow for ChromeOS windows/dialogs. (Closed) Base URL: http://src.chromium.org/git/chromium.git
Patch Set: fix win trybot Created 10 years, 2 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
Index: chrome/browser/chromeos/native_dialog_window.cc
diff --git a/chrome/browser/chromeos/native_dialog_window.cc b/chrome/browser/chromeos/native_dialog_window.cc
index 200dd62f4dc2abc4cc8678d1fd24a52085aa97c5..003912e4befa3ad24f1cfcc731cd149df28c9b3f 100644
--- a/chrome/browser/chromeos/native_dialog_window.cc
+++ b/chrome/browser/chromeos/native_dialog_window.cc
@@ -10,6 +10,7 @@
#include "base/logging.h"
#include "base/utf_string_conversions.h"
#include "chrome/browser/chromeos/frame/bubble_window.h"
+#include "chrome/browser/views/window.h"
#include "views/controls/native/native_view_host.h"
#include "views/window/dialog_delegate.h"
#include "views/window/non_client_view.h"
@@ -218,6 +219,7 @@ void NativeDialogHost::Init() {
gtk_widget_show_all(contents);
contents_view_ = new views::NativeViewHost();
+ // TODO(xiyuan): Find a better way to get proper background.
contents_view_->set_background(views::Background::CreateSolidBackground(
BubbleWindow::kBackgroundColor));
AddChildView(contents_view_);
@@ -265,7 +267,7 @@ void ShowNativeDialog(gfx::NativeWindow parent,
const gfx::Size& min_size) {
NativeDialogHost* native_dialog_host =
new NativeDialogHost(native_dialog, flags, size, min_size);
- BubbleWindow::Create(parent, gfx::Rect(), native_dialog_host);
+ browser::CreateViewsWindow(parent, gfx::Rect(), native_dialog_host);
native_dialog_host->window()->Show();
}
« no previous file with comments | « chrome/browser/chromeos/login/existing_user_controller.cc ('k') | chrome/browser/chromeos/network_message_observer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698