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

Side by Side Diff: ash/shelf/shelf_widget_unittest.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: LauncherItemController Unit Tests Fix after Rebase Created 4 years, 3 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
« no previous file with comments | « ash/shelf/shelf_view_unittest.cc ('k') | ash/test/test_shelf_delegate.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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_widget.h" 5 #include "ash/common/shelf/shelf_widget.h"
6 6
7 #include "ash/common/material_design/material_design_controller.h" 7 #include "ash/common/material_design/material_design_controller.h"
8 #include "ash/common/shelf/shelf_constants.h" 8 #include "ash/common/shelf/shelf_constants.h"
9 #include "ash/common/shelf/shelf_delegate.h" 9 #include "ash/common/shelf/shelf_delegate.h"
10 #include "ash/common/shelf/shelf_layout_manager.h" 10 #include "ash/common/shelf/shelf_layout_manager.h"
(...skipping 356 matching lines...) Expand 10 before | Expand all | Expand 10 after
367 void OnShelfCreated(WmShelf* shelf) override { 367 void OnShelfCreated(WmShelf* shelf) override {
368 shelf->SetAlignment(initial_alignment_); 368 shelf->SetAlignment(initial_alignment_);
369 shelf->SetAutoHideBehavior(initial_auto_hide_behavior_); 369 shelf->SetAutoHideBehavior(initial_auto_hide_behavior_);
370 } 370 }
371 void OnShelfDestroyed(WmShelf* shelf) override {} 371 void OnShelfDestroyed(WmShelf* shelf) override {}
372 void OnShelfAlignmentChanged(WmShelf* shelf) override {} 372 void OnShelfAlignmentChanged(WmShelf* shelf) override {}
373 void OnShelfAutoHideBehaviorChanged(WmShelf* shelf) override {} 373 void OnShelfAutoHideBehaviorChanged(WmShelf* shelf) override {}
374 void OnShelfAutoHideStateChanged(WmShelf* shelf) override {} 374 void OnShelfAutoHideStateChanged(WmShelf* shelf) override {}
375 void OnShelfVisibilityStateChanged(WmShelf* shelf) override {} 375 void OnShelfVisibilityStateChanged(WmShelf* shelf) override {}
376 ShelfID GetShelfIDForAppID(const std::string& app_id) override { return 0; } 376 ShelfID GetShelfIDForAppID(const std::string& app_id) override { return 0; }
377 ShelfID GetShelfIDForAppIDAndLaunchID(const std::string& app_id,
378 const std::string& launch_id) override {
379 return 0;
380 }
377 bool HasShelfIDToAppIDMapping(ShelfID id) const override { return false; } 381 bool HasShelfIDToAppIDMapping(ShelfID id) const override { return false; }
378 const std::string& GetAppIDForShelfID(ShelfID id) override { 382 const std::string& GetAppIDForShelfID(ShelfID id) override {
379 return base::EmptyString(); 383 return base::EmptyString();
380 } 384 }
381 void PinAppWithID(const std::string& app_id) override {} 385 void PinAppWithID(const std::string& app_id) override {}
382 bool IsAppPinned(const std::string& app_id) override { return false; } 386 bool IsAppPinned(const std::string& app_id) override { return false; }
383 void UnpinAppWithID(const std::string& app_id) override {} 387 void UnpinAppWithID(const std::string& app_id) override {}
384 388
385 private: 389 private:
386 ShelfAlignment initial_alignment_; 390 ShelfAlignment initial_alignment_;
(...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after
492 } 496 }
493 497
494 TEST_P(ShelfWidgetTestWithDelegate, CreateLockedShelf) { 498 TEST_P(ShelfWidgetTestWithDelegate, CreateLockedShelf) {
495 // The auto hide state 'HIDDEN' is returned for any non-auto-hide behavior. 499 // The auto hide state 'HIDDEN' is returned for any non-auto-hide behavior.
496 TestCreateShelfWithInitialValues(SHELF_ALIGNMENT_BOTTOM_LOCKED, 500 TestCreateShelfWithInitialValues(SHELF_ALIGNMENT_BOTTOM_LOCKED,
497 SHELF_AUTO_HIDE_BEHAVIOR_NEVER, 501 SHELF_AUTO_HIDE_BEHAVIOR_NEVER,
498 SHELF_VISIBLE, SHELF_AUTO_HIDE_HIDDEN); 502 SHELF_VISIBLE, SHELF_AUTO_HIDE_HIDDEN);
499 } 503 }
500 504
501 } // namespace ash 505 } // namespace ash
OLDNEW
« no previous file with comments | « ash/shelf/shelf_view_unittest.cc ('k') | ash/test/test_shelf_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698