diff options
| author | sadrul <sadrul@chromium.org> | 2015-11-10 11:06:52 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-11-10 19:08:12 +0000 |
| commit | 436fbdb7cd02e2e0fce4ed6929f6ec3edf2aef02 (patch) | |
| tree | d84f313c49706968543d47e7c2b029278ef8ebeb /mandoline | |
| parent | 26b892f42e742dc0c58fdd53683d65bd238dbc3f (diff) | |
| download | chromium_src-436fbdb7cd02e2e0fce4ed6929f6ec3edf2aef02.zip chromium_src-436fbdb7cd02e2e0fce4ed6929f6ec3edf2aef02.tar.gz chromium_src-436fbdb7cd02e2e0fce4ed6929f6ec3edf2aef02.tar.bz2 | |
views/mus: Remove NativeWidgetViewManager, and use NativeWidgetMus instead.
BUG=none
Review URL: https://codereview.chromium.org/1430913004
Cr-Commit-Position: refs/heads/master@{#358867}
Diffstat (limited to 'mandoline')
| -rw-r--r-- | mandoline/ui/desktop_ui/browser_window.cc | 6 | ||||
| -rw-r--r-- | mandoline/ui/omnibox/omnibox_application.cc | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/mandoline/ui/desktop_ui/browser_window.cc b/mandoline/ui/desktop_ui/browser_window.cc index 5a9dcaf..2b4ad48 100644 --- a/mandoline/ui/desktop_ui/browser_window.cc +++ b/mandoline/ui/desktop_ui/browser_window.cc @@ -27,7 +27,7 @@ #include "ui/views/controls/button/label_button.h" #include "ui/views/mus/aura_init.h" #include "ui/views/mus/display_converter.h" -#include "ui/views/mus/native_widget_view_manager.h" +#include "ui/views/mus/native_widget_mus.h" #include "ui/views/widget/widget_delegate.h" namespace mandoline { @@ -415,8 +415,8 @@ void BrowserWindow::Init(mus::Window* root) { views::Widget* widget = new views::Widget; views::Widget::InitParams params( views::Widget::InitParams::TYPE_WINDOW_FRAMELESS); - params.native_widget = - new views::NativeWidgetViewManager(widget, app_->shell(), root_); + params.native_widget = new views::NativeWidgetMus( + widget, app_->shell(), root, mus::mojom::SURFACE_TYPE_DEFAULT); params.delegate = widget_delegate; params.bounds = root_->bounds(); widget->Init(params); diff --git a/mandoline/ui/omnibox/omnibox_application.cc b/mandoline/ui/omnibox/omnibox_application.cc index 3a17170..631a386 100644 --- a/mandoline/ui/omnibox/omnibox_application.cc +++ b/mandoline/ui/omnibox/omnibox_application.cc @@ -20,7 +20,7 @@ #include "ui/views/layout/layout_manager.h" #include "ui/views/mus/aura_init.h" #include "ui/views/mus/display_converter.h" -#include "ui/views/mus/native_widget_view_manager.h" +#include "ui/views/mus/native_widget_mus.h" #include "ui/views/widget/widget_delegate.h" namespace mandoline { @@ -139,8 +139,8 @@ void OmniboxImpl::OnEmbed(mus::Window* root) { views::Widget* widget = new views::Widget; views::Widget::InitParams params( views::Widget::InitParams::TYPE_WINDOW_FRAMELESS); - params.native_widget = - new views::NativeWidgetViewManager(widget, app_->shell(), root); + params.native_widget = new views::NativeWidgetMus( + widget, app_->shell(), root, mus::mojom::SURFACE_TYPE_DEFAULT); params.delegate = widget_delegate; params.bounds = root->bounds(); params.opacity = views::Widget::InitParams::TRANSLUCENT_WINDOW; |