ash/test/test_shelf_delegate.cc - Issue 2171813004: mash: Fold ShelfItemDelegateManager into ShelfModel

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/test/test_shelf_delegate.cc

Issue 2171813004: mash: Fold ShelfItemDelegateManager into ShelfModel (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: explicitly destroy ShelfItemDelegates 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

« no previous file with comments | « ash/test/shelf_item_delegate_manager_test_api.cc ('k') | chrome/browser/ui/ash/launcher/app_window_launcher_item_controller.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: ash/test/test_shelf_delegate.cc

diff --git a/ash/test/test_shelf_delegate.cc b/ash/test/test_shelf_delegate.cc

index 2605eb1148af3ee05849ee6d2b206bdac01ce757..8f836d991a9e7139322334807d17b3505bedd0a2 100644

--- a/ash/test/test_shelf_delegate.cc

+++ b/ash/test/test_shelf_delegate.cc

@@ -6,10 +6,8 @@

#include <utility>

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

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

#include "ash/shelf/shelf_util.h"

-#include "ash/shell.h"

#include "ash/test/test_shelf_item_delegate.h"

#include "base/strings/string_util.h"

#include "base/strings/utf_string_conversions.h"

@@ -51,12 +49,9 @@ void TestShelfDelegate::AddShelfItem(aura::Window* window,

model_->Add(item);

window->AddObserver(this);

- ShelfItemDelegateManager* manager =

- Shell::GetInstance()->shelf_item_delegate_manager();

- // |manager| owns TestShelfItemDelegate.

std::unique_ptr<ShelfItemDelegate> delegate(

new TestShelfItemDelegate(window));

- manager->SetShelfItemDelegate(id, std::move(delegate));

+ model_->SetShelfItemDelegate(id, std::move(delegate));

SetShelfIDForWindow(id, window);

}