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

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

Issue 2391253004: Use mojo Shelf interfaces for both mash and classic ash. (Closed)
Patch Set: Sync and rebase. Created 4 years, 2 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 232 matching lines...) Expand 10 before | Expand all | Expand 10 after
243 // ids. This does not support pinning and unpinning operations and the return 243 // ids. This does not support pinning and unpinning operations and the return
244 // value of IsAppPinned(...) is configurable. 244 // value of IsAppPinned(...) is configurable.
245 class TestShelfDelegateForShelfView : public ShelfDelegate { 245 class TestShelfDelegateForShelfView : public ShelfDelegate {
246 public: 246 public:
247 TestShelfDelegateForShelfView() {} 247 TestShelfDelegateForShelfView() {}
248 ~TestShelfDelegateForShelfView() override {} 248 ~TestShelfDelegateForShelfView() override {}
249 249
250 void set_is_app_pinned(bool is_pinned) { is_app_pinned_ = is_pinned; } 250 void set_is_app_pinned(bool is_pinned) { is_app_pinned_ = is_pinned; }
251 251
252 // ShelfDelegate overrides: 252 // ShelfDelegate overrides:
253 void OnShelfCreated(WmShelf* shelf) override {}
254
255 void OnShelfDestroyed(WmShelf* shelf) override {}
256
257 void OnShelfAlignmentChanged(WmShelf* shelf) override {}
258
259 void OnShelfAutoHideBehaviorChanged(WmShelf* shelf) override {}
260
261 void OnShelfAutoHideStateChanged(WmShelf* shelf) override {}
262
263 void OnShelfVisibilityStateChanged(WmShelf* shelf) override {}
264
265 ShelfID GetShelfIDForAppID(const std::string& app_id) override { 253 ShelfID GetShelfIDForAppID(const std::string& app_id) override {
266 ShelfID id = 0; 254 ShelfID id = 0;
267 EXPECT_TRUE(base::StringToInt(app_id, &id)); 255 EXPECT_TRUE(base::StringToInt(app_id, &id));
268 return id; 256 return id;
269 } 257 }
270 258
271 ShelfID GetShelfIDForAppIDAndLaunchID(const std::string& app_id, 259 ShelfID GetShelfIDForAppIDAndLaunchID(const std::string& app_id,
272 const std::string& launch_id) override { 260 const std::string& launch_id) override {
273 return GetShelfIDForAppID(app_id); 261 return GetShelfIDForAppID(app_id);
274 } 262 }
(...skipping 2896 matching lines...) Expand 10 before | Expand all | Expand 10 after
3171 IsEmpty()); 3159 IsEmpty());
3172 3160
3173 ASSERT_TRUE(test_api_->IsShowingOverflowBubble()); 3161 ASSERT_TRUE(test_api_->IsShowingOverflowBubble());
3174 } 3162 }
3175 } 3163 }
3176 3164
3177 #endif // !defined(OS_WIN) 3165 #endif // !defined(OS_WIN)
3178 3166
3179 } // namespace test 3167 } // namespace test
3180 } // namespace ash 3168 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698