ui/views/mus/platform_test_helper_mus.cc - Issue 1674903003: Extract shell methods from ApplicationImpl into a base class, and pass this to Initialize() instead.

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: ui/views/mus/platform_test_helper_mus.cc

Issue 1674903003: Extract shell methods from ApplicationImpl into a base class, and pass this to Initialize() instead. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@mojom

Patch Set: . Created 4 years, 10 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: ui/views/mus/platform_test_helper_mus.cc

diff --git a/ui/views/mus/platform_test_helper_mus.cc b/ui/views/mus/platform_test_helper_mus.cc

index 7fc3b2286ab3935ba38c6ab119fe6f8452c4e5ae..c4faba14babcb72e5bc40d64655bae10f7ebc4ba 100644

--- a/ui/views/mus/platform_test_helper_mus.cc

+++ b/ui/views/mus/platform_test_helper_mus.cc

@@ -5,8 +5,8 @@

#include "ui/views/test/platform_test_helper.h"

#include "base/path_service.h"

-#include "mojo/shell/public/cpp/application_impl.h"

#include "mojo/shell/public/cpp/application_test_base.h"

+#include "mojo/shell/public/cpp/shell.h"

#include "ui/aura/env.h"

#include "ui/base/resource/resource_bundle.h"

#include "ui/base/ui_base_paths.h"

@@ -31,9 +31,8 @@ class PlatformTestHelperMus : public PlatformTestHelper {

mojo_test_helper_.reset(new mojo::test::TestHelper(nullptr));

// ui/views/mus requires a WindowManager running, for now use the desktop

// one.

- mojo_test_helper_->application_impl()->ConnectToApplication(

- "mojo:desktop_wm");

- WindowManagerConnection::Create(mojo_test_helper_->application_impl());

+ mojo_test_helper_->shell()->ConnectToApplication("mojo:desktop_wm");

+ WindowManagerConnection::Create(mojo_test_helper_->shell());

}

~PlatformTestHelperMus() override {

« no previous file with comments | « ui/views/mus/native_widget_mus.cc ('k') | ui/views/mus/platform_window_mus.h » ('j') | no next file with comments »