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

Side by Side Diff: ash/shelf/shelf_view_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/mus/shelf_delegate_mus.cc ('k') | ash/shelf/shelf_widget_unittest.cc » ('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) 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 248 matching lines...) Expand 10 before | Expand all | Expand 10 after
259 void OnShelfAutoHideStateChanged(WmShelf* shelf) override {} 259 void OnShelfAutoHideStateChanged(WmShelf* shelf) override {}
260 260
261 void OnShelfVisibilityStateChanged(WmShelf* shelf) override {} 261 void OnShelfVisibilityStateChanged(WmShelf* shelf) override {}
262 262
263 ShelfID GetShelfIDForAppID(const std::string& app_id) override { 263 ShelfID GetShelfIDForAppID(const std::string& app_id) override {
264 ShelfID id = 0; 264 ShelfID id = 0;
265 EXPECT_TRUE(base::StringToInt(app_id, &id)); 265 EXPECT_TRUE(base::StringToInt(app_id, &id));
266 return id; 266 return id;
267 } 267 }
268 268
269 ShelfID GetShelfIDForAppIDAndLaunchID(const std::string& app_id,
270 const std::string& launch_id) override {
271 return GetShelfIDForAppID(app_id);
272 }
273
269 bool HasShelfIDToAppIDMapping(ShelfID id) const override { return true; } 274 bool HasShelfIDToAppIDMapping(ShelfID id) const override { return true; }
270 275
271 const std::string& GetAppIDForShelfID(ShelfID id) override { 276 const std::string& GetAppIDForShelfID(ShelfID id) override {
272 // Use |app_id_| member variable because returning a reference to local 277 // Use |app_id_| member variable because returning a reference to local
273 // variable is not allowed. 278 // variable is not allowed.
274 app_id_ = base::IntToString(id); 279 app_id_ = base::IntToString(id);
275 return app_id_; 280 return app_id_;
276 } 281 }
277 282
278 void PinAppWithID(const std::string& app_id) override { NOTREACHED(); } 283 void PinAppWithID(const std::string& app_id) override { NOTREACHED(); }
(...skipping 2287 matching lines...) Expand 10 before | Expand all | Expand 10 after
2566 test_api_->CloseMenu(); 2571 test_api_->CloseMenu();
2567 EXPECT_EQ(views::InkDropState::HIDDEN, 2572 EXPECT_EQ(views::InkDropState::HIDDEN,
2568 browser_button_ink_drop_->GetTargetInkDropState()); 2573 browser_button_ink_drop_->GetTargetInkDropState());
2569 EXPECT_THAT(browser_button_ink_drop_->GetAndResetRequestedStates(), 2574 EXPECT_THAT(browser_button_ink_drop_->GetAndResetRequestedStates(),
2570 ElementsAre(views::InkDropState::ACTIVATED, 2575 ElementsAre(views::InkDropState::ACTIVATED,
2571 views::InkDropState::DEACTIVATED)); 2576 views::InkDropState::DEACTIVATED));
2572 } 2577 }
2573 2578
2574 } // namespace test 2579 } // namespace test
2575 } // namespace ash 2580 } // namespace ash
OLDNEW
« no previous file with comments | « ash/mus/shelf_delegate_mus.cc ('k') | ash/shelf/shelf_widget_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698