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

Side by Side Diff: ash/shelf/shelf_view_unittest.cc

Issue 2716403005: mash: Remove shelf app menu item objects. (Closed)
Patch Set: Address comments. Created 3 years, 9 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ash/common/shelf/shelf_view.h" 5 #include "ash/common/shelf/shelf_view.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <memory> 8 #include <memory>
9 #include <utility> 9 #include <utility>
10 #include <vector> 10 #include <vector>
(...skipping 1939 matching lines...) Expand 10 before | Expand all | Expand 10 after
1950 class ListMenuShelfItemDelegate : public TestShelfItemDelegate { 1950 class ListMenuShelfItemDelegate : public TestShelfItemDelegate {
1951 public: 1951 public:
1952 ListMenuShelfItemDelegate() : TestShelfItemDelegate(nullptr) {} 1952 ListMenuShelfItemDelegate() : TestShelfItemDelegate(nullptr) {}
1953 ~ListMenuShelfItemDelegate() override {} 1953 ~ListMenuShelfItemDelegate() override {}
1954 1954
1955 private: 1955 private:
1956 // TestShelfItemDelegate: 1956 // TestShelfItemDelegate:
1957 ShelfAppMenuItemList GetAppMenuItems(int event_flags) override { 1957 ShelfAppMenuItemList GetAppMenuItems(int event_flags) override {
1958 ShelfAppMenuItemList items; 1958 ShelfAppMenuItemList items;
1959 base::string16 title = base::ASCIIToUTF16("title"); 1959 base::string16 title = base::ASCIIToUTF16("title");
1960 items.push_back(base::MakeUnique<ShelfApplicationMenuItem>(title)); 1960 items.push_back(base::MakeUnique<ShelfApplicationMenuItem>(0, title));
1961 items.push_back(base::MakeUnique<ShelfApplicationMenuItem>(title)); 1961 items.push_back(base::MakeUnique<ShelfApplicationMenuItem>(1, title));
1962 return items; 1962 return items;
1963 } 1963 }
1964 1964
1965 DISALLOW_COPY_AND_ASSIGN(ListMenuShelfItemDelegate); 1965 DISALLOW_COPY_AND_ASSIGN(ListMenuShelfItemDelegate);
1966 }; 1966 };
1967 1967
1968 } // namespace 1968 } // namespace
1969 1969
1970 // Test fixture for testing material design ink drop ripples on shelf. 1970 // Test fixture for testing material design ink drop ripples on shelf.
1971 class ShelfViewInkDropTest : public ShelfViewTest { 1971 class ShelfViewInkDropTest : public ShelfViewTest {
(...skipping 989 matching lines...) Expand 10 before | Expand all | Expand 10 after
2961 EXPECT_EQ(views::InkDropState::ACTIVATED, 2961 EXPECT_EQ(views::InkDropState::ACTIVATED,
2962 overflow_button_ink_drop_->GetTargetInkDropState()); 2962 overflow_button_ink_drop_->GetTargetInkDropState());
2963 EXPECT_THAT(overflow_button_ink_drop_->GetAndResetRequestedStates(), 2963 EXPECT_THAT(overflow_button_ink_drop_->GetAndResetRequestedStates(),
2964 IsEmpty()); 2964 IsEmpty());
2965 2965
2966 ASSERT_TRUE(test_api_->IsShowingOverflowBubble()); 2966 ASSERT_TRUE(test_api_->IsShowingOverflowBubble());
2967 } 2967 }
2968 2968
2969 } // namespace test 2969 } // namespace test
2970 } // namespace ash 2970 } // namespace ash
OLDNEW
« no previous file with comments | « ash/public/cpp/shelf_application_menu_item.cc ('k') | ash/shell/window_watcher_shelf_item_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698