diff options
| author | Ben Murdoch <benm@google.com> | 2010-11-18 18:32:45 +0000 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2010-11-18 18:38:07 +0000 |
| commit | 513209b27ff55e2841eac0e4120199c23acce758 (patch) | |
| tree | aeba30bb08c5f47c57003544e378a377c297eee6 /chrome/browser/chromeos/frame/bubble_window.cc | |
| parent | 164f7496de0fbee436b385a79ead9e3cb81a50c1 (diff) | |
| download | external_chromium-513209b27ff55e2841eac0e4120199c23acce758.zip external_chromium-513209b27ff55e2841eac0e4120199c23acce758.tar.gz external_chromium-513209b27ff55e2841eac0e4120199c23acce758.tar.bz2 | |
Merge Chromium at r65505: Initial merge by git.
Change-Id: I31d8f1d8cd33caaf7f47ffa7350aef42d5fbdb45
Diffstat (limited to 'chrome/browser/chromeos/frame/bubble_window.cc')
| -rw-r--r-- | chrome/browser/chromeos/frame/bubble_window.cc | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/chrome/browser/chromeos/frame/bubble_window.cc b/chrome/browser/chromeos/frame/bubble_window.cc index 79a0c57..25db342 100644 --- a/chrome/browser/chromeos/frame/bubble_window.cc +++ b/chrome/browser/chromeos/frame/bubble_window.cc @@ -32,16 +32,12 @@ void BubbleWindow::Init(GtkWindow* parent, const gfx::Rect& bounds) { views::Window* BubbleWindow::Create( gfx::NativeWindow parent, const gfx::Rect& bounds, + Style style, views::WindowDelegate* window_delegate) { BubbleWindow* window = new BubbleWindow(window_delegate); - window->GetNonClientView()->SetFrameView(new BubbleFrameView(window)); + window->GetNonClientView()->SetFrameView(new BubbleFrameView(window, style)); window->Init(parent, bounds); - chromeos::WmIpc::instance()->SetWindowType( - window->GetNativeView(), - chromeos::WM_IPC_WINDOW_CHROME_INFO_BUBBLE, - NULL); - return window; } |