ash/mus/shelf_delegate_mus.cc - Issue 1882423004: Move shell service to toplevel shell namespace

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: ash/mus/shelf_delegate_mus.cc

Issue 1882423004: Move shell service to toplevel shell namespace (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: rebase Created 4 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:

Index: ash/mus/shelf_delegate_mus.cc

diff --git a/ash/mus/shelf_delegate_mus.cc b/ash/mus/shelf_delegate_mus.cc

index b5a6623f58bde9440fba3507f7dd252b425bdc80..2dc106efdb9d3e2a534a6a64134993355fc4bd5d 100644

--- a/ash/mus/shelf_delegate_mus.cc

+++ b/ash/mus/shelf_delegate_mus.cc

@@ -114,7 +114,7 @@ gfx::ImageSkia GetShelfIconFromSerializedBitmap(

ShelfDelegateMus::ShelfDelegateMus(ShelfModel* model)

: model_(model), binding_(this) {

- mojo::Connector* connector =

+ ::shell::Connector* connector =

views::WindowManagerConnection::Get()->connector();

connector->ConnectToInterface("mojo:desktop_wm", &user_window_controller_);

user_window_controller_->AddUserWindowObserver(

« no previous file with comments | « ash/mus/main.cc ('k') | ash/mus/sysui_application.h » ('j') | no next file with comments »