mash/browser/browser.cc - Issue 2119963002: Move mus to //services/ui

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: mash/browser/browser.cc

Issue 2119963002: Move mus to //services/ui (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: . Created 4 years, 6 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:

Index: mash/browser/browser.cc

diff --git a/mash/browser/browser.cc b/mash/browser/browser.cc

index 814bcd33d33398d0984cfabe48c2b081ad2b5197..fc88951358e92e52cd3360b5a5b74168276168d4 100644

--- a/mash/browser/browser.cc

+++ b/mash/browser/browser.cc

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

#include "base/strings/utf_string_conversions.h"

#include "base/threading/thread_task_runner_handle.h"

#include "base/timer/timer.h"

-#include "components/mus/public/cpp/window.h"

-#include "components/mus/public/cpp/window_tree_client.h"

#include "mash/browser/debug_view.h"

#include "mash/public/interfaces/launchable.mojom.h"

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

@@ -26,6 +24,8 @@

#include "services/shell/public/cpp/connector.h"

#include "services/shell/public/cpp/shell_client.h"

#include "services/tracing/public/cpp/tracing_impl.h"

+#include "services/ui/public/cpp/window.h"

+#include "services/ui/public/cpp/window_tree_client.h"

#include "ui/aura/mus/mus_util.h"

#include "ui/base/models/menu_model.h"

#include "ui/gfx/canvas.h"

« no previous file with comments | « mash/browser/BUILD.gn ('k') | mash/catalog_viewer/BUILD.gn » ('j') | no next file with comments »