ash/shelf/shelf_view.cc - Issue 2118593002: mash: Migrate ShellDelegate ownership and access to WmShell.

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/shelf/shelf_view.cc

Issue 2118593002: mash: Migrate ShellDelegate ownership and access to WmShell. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Address comments. Created 4 years, 5 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: ash/shelf/shelf_view.cc

diff --git a/ash/shelf/shelf_view.cc b/ash/shelf/shelf_view.cc

index 634bb69f9e63dae91008d783d18c1ff989195bab..964a8b69e2e9f807ccb8b1cbd6544d9afd8d1071 100644

--- a/ash/shelf/shelf_view.cc

+++ b/ash/shelf/shelf_view.cc

@@ -14,6 +14,7 @@

#include "ash/common/shelf/shelf_item_delegate_manager.h"

#include "ash/common/shelf/shelf_menu_model.h"

#include "ash/common/shelf/shelf_model.h"

+#include "ash/common/shell_delegate.h"

#include "ash/common/wm/root_window_finder.h"

#include "ash/common/wm_shell.h"

#include "ash/drag_drop/drag_image_view.h"

@@ -28,7 +29,6 @@

#include "ash/shelf/shelf_icon_observer.h"

#include "ash/shelf/shelf_widget.h"

#include "ash/shell.h"

-#include "ash/shell_delegate.h"

#include "base/auto_reset.h"

#include "base/metrics/histogram.h"

#include "grit/ash_strings.h"

@@ -1794,7 +1794,7 @@ void ShelfView::ShowContextMenuForView(views::View* source,

}

std::unique_ptr<ui::MenuModel> context_menu_model(

- Shell::GetInstance()->delegate()->CreateContextMenu(wm_shelf_, item));

+ WmShell::Get()->delegate()->CreateContextMenu(wm_shelf_, item));

if (!context_menu_model)

return;

« no previous file with comments | « ash/shelf/shelf.cc ('k') | ash/shell.h » ('j') | no next file with comments »