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

Unified Diff: mandoline/ui/desktop_ui/browser_window.cc

Issue 1402213002: Moves mandoline/ui/aura to ui/views/mus (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: disable presubmit Created 5 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
« no previous file with comments | « mandoline/ui/desktop_ui/browser_window.h ('k') | mandoline/ui/omnibox/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mandoline/ui/desktop_ui/browser_window.cc
diff --git a/mandoline/ui/desktop_ui/browser_window.cc b/mandoline/ui/desktop_ui/browser_window.cc
index c9680656c9a787f1b858ba627c751739b2aa93c1..4cba29514c1b9c29f62d507cb1bae697d28d48da 100644
--- a/mandoline/ui/desktop_ui/browser_window.cc
+++ b/mandoline/ui/desktop_ui/browser_window.cc
@@ -10,7 +10,6 @@
#include "base/time/time.h"
#include "components/mus/public/cpp/scoped_view_ptr.h"
#include "components/mus/public/cpp/view_tree_host_factory.h"
-#include "mandoline/ui/aura/native_widget_view_manager.h"
#include "mandoline/ui/desktop_ui/browser_commands.h"
#include "mandoline/ui/desktop_ui/browser_manager.h"
#include "mandoline/ui/desktop_ui/find_bar_view.h"
@@ -23,6 +22,7 @@
#include "ui/gfx/canvas.h"
#include "ui/views/background.h"
#include "ui/views/controls/button/label_button.h"
+#include "ui/views/mus/native_widget_view_manager.h"
#include "ui/views/widget/widget_delegate.h"
namespace mandoline {
@@ -373,7 +373,8 @@ void BrowserWindow::OnHideFindBar() {
void BrowserWindow::Init(mus::View* root) {
DCHECK_GT(root->viewport_metrics().device_pixel_ratio, 0);
if (!aura_init_)
- aura_init_.reset(new AuraInit(root, app_->shell(), "mandoline_ui.pak"));
+ aura_init_.reset(
+ new views::AuraInit(root, app_->shell(), "mandoline_ui.pak"));
root_ = root;
omnibox_view_ = root_->connection()->CreateView();
@@ -395,7 +396,7 @@ void BrowserWindow::Init(mus::View* root) {
views::Widget::InitParams params(
views::Widget::InitParams::TYPE_WINDOW_FRAMELESS);
params.native_widget =
- new NativeWidgetViewManager(widget, app_->shell(), root_);
+ new views::NativeWidgetViewManager(widget, app_->shell(), root_);
params.delegate = widget_delegate;
params.bounds = root_->bounds().To<gfx::Rect>();
widget->Init(params);
« no previous file with comments | « mandoline/ui/desktop_ui/browser_window.h ('k') | mandoline/ui/omnibox/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698