components/mus/example/views_examples/views_examples_application_delegate.cc - Issue 1407073002: Adds GetDisplays() to WindowManager

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: components/mus/example/views_examples/views_examples_application_delegate.cc

Issue 1407073002: Adds GetDisplays() to WindowManager (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: merge 2 trunk 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 | « components/mus/example/common/mus_views_init.cc ('k') | components/mus/example/window_type_launcher/window_type_launcher.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: components/mus/example/views_examples/views_examples_application_delegate.cc

diff --git a/components/mus/example/views_examples/views_examples_application_delegate.cc b/components/mus/example/views_examples/views_examples_application_delegate.cc

index 889186cf15a21f96f211d241a0da202f6289a1ba..d02cb6733ba14b48cd18b14763e865be33665ba3 100644

--- a/components/mus/example/views_examples/views_examples_application_delegate.cc

+++ b/components/mus/example/views_examples/views_examples_application_delegate.cc

@@ -9,7 +9,6 @@

#include "mojo/application/public/cpp/application_impl.h"

#include "ui/views/examples/example_base.h"

#include "ui/views/examples/examples_window.h"

-#include "ui/views/widget/widget_delegate.h"

ViewsExamplesApplicationDelegate::ViewsExamplesApplicationDelegate()

: app_(nullptr) {}

@@ -22,12 +21,6 @@ void ViewsExamplesApplicationDelegate::Initialize(mojo::ApplicationImpl* app) {

mus_views_init_.reset(new MUSViewsInit(app));

- // TODO(sky): total hack! This is necessary as WindowTypeLauncherView is

- // created before AuraInit. WindowTypeLauncherView uses resources that are

- // configured by MUSViewsInit once a View is created. By creating a Widget

- // here we ensure the necessary state has been setup.

- views::Widget::CreateWindow(new views::WidgetDelegateView);

views::examples::ShowExamplesWindow(views::examples::DO_NOTHING_ON_CLOSE,

nullptr, nullptr);

}