components/window_manager/main.cc - Issue 1085233004: Moves services implementations out of third_party/mojo_services

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/window_manager/main.cc

Issue 1085233004: Moves services implementations out of third_party/mojo_services (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: unnecessary changes Created 5 years, 8 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

« components/view_manager/public/cpp/lib/view_private.h ('K') | « components/window_manager/focus_rules.h ('k') | components/window_manager/native_viewport_event_dispatcher_impl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: components/window_manager/main.cc

diff --git a/components/window_manager/main.cc b/components/window_manager/main.cc

index 5edfec90b169c739f8573e2c280841d3a623adf0..5fbda31387248015b5bb6d09e9d1a64cd10cd7db 100644

--- a/components/window_manager/main.cc

+++ b/components/window_manager/main.cc

@@ -3,6 +3,8 @@

// found in the LICENSE file.

#include "base/memory/scoped_ptr.h"

+#include "components/view_manager/public/cpp/view_manager.h"

+#include "components/view_manager/public/cpp/view_manager_delegate.h"

#include "components/window_manager/basic_focus_rules.h"

#include "components/window_manager/window_manager_app.h"

#include "components/window_manager/window_manager_delegate.h"

@@ -11,8 +13,6 @@

#include "third_party/mojo/src/mojo/public/c/system/main.h"

#include "third_party/mojo/src/mojo/public/cpp/application/application_delegate.h"

#include "third_party/mojo/src/mojo/public/cpp/application/service_provider_impl.h"

-#include "third_party/mojo_services/src/view_manager/public/cpp/view_manager.h"

-#include "third_party/mojo_services/src/view_manager/public/cpp/view_manager_delegate.h"

// ApplicationDelegate implementation file for WindowManager users (e.g.

// core window manager tests) that do not want to provide their own