Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(49)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ash/common/test/test_shelf_item_delegate.h

Issue 2671923002: mash: Cleanup ash shelf application menu code. (Closed)
Patch Set: Fix tests; cleanup. Created 3 years, 10 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_window_watcher_item_delegate.h ('K') | « ash/common/shelf/shelf_window_watcher_item_delegate.cc ('k') | ash/common/test/test_shelf_item_delegate.cc » ('j') | ash/common/test/test_shelf_item_delegate.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/common/test/test_shelf_item_delegate.h
diff --git a/ash/common/test/test_shelf_item_delegate.h b/ash/common/test/test_shelf_item_delegate.h
index 62743ac9517f8505709f73e686bcd8b7d6988842..aca54b200d6acd64cc02680521163f32acf728d7 100644
--- a/ash/common/test/test_shelf_item_delegate.h
+++ b/ash/common/test/test_shelf_item_delegate.h
@@ -24,7 +24,7 @@ class TestShelfItemDelegate : public ShelfItemDelegate {
// ShelfItemDelegate:
ShelfItemDelegate::PerformedAction ItemSelected(
const ui::Event& event) override;
- ui::SimpleMenuModel* CreateApplicationMenu(int event_flags) override;
+ ash::ShelfApplicationMenuItems GetAppMenuItems(int event_flags) override;
James Cook 2017/02/06 17:30:21 I presume ash:: is needed because of the test name
msw 2017/02/07 09:12:01 Nope, I just missed this; removed.
void Close() override;
private:
« ash/common/shelf/shelf_window_watcher_item_delegate.h ('K') | « ash/common/shelf/shelf_window_watcher_item_delegate.cc ('k') | ash/common/test/test_shelf_item_delegate.cc » ('j') | ash/common/test/test_shelf_item_delegate.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698