ash/test/test_shelf_delegate.cc - Issue 2290603002: Enhance chrome.app.window API for shelf integration with pinning support

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 2290603002: Enhance chrome.app.window API for shelf integration with pinning support (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

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

« ash/common/shelf/shelf_view.cc ('K') | « ash/test/test_shelf_delegate.h ('k') | chrome/browser/ui/ash/app_list/app_list_controller_ash.cc » ('j') | chrome/browser/ui/ash/launcher/app_shortcut_launcher_item_controller.h » ('J')
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 8f836d991a9e7139322334807d17b3505bedd0a2..9e93e7bffcf7cf48be390e4f713217592a579024 100644

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

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

@@ -97,7 +97,8 @@ void TestShelfDelegate::OnShelfAutoHideStateChanged(Shelf* shelf) {}

void TestShelfDelegate::OnShelfVisibilityStateChanged(Shelf* shelf) {}

-ShelfID TestShelfDelegate::GetShelfIDForAppID(const std::string& app_id) {

+ShelfID TestShelfDelegate::GetShelfIDForAppID(const std::string& app_id,

+ const std::string& app_shelf_id) {

stevenjb 2016/08/29 15:56:30 To document that app_shelf_id is unused: cons std

Andra Paraschiv 2016/08/30 09:58:24 Done.

for (auto const& iter : shelf_id_to_app_id_map_) {

if (iter.second == app_id)

return iter.first;