| OLD | NEW | 
|---|
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 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 "chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl.h" | 5 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl.h" | 
| 6 | 6 | 
| 7 #include <stddef.h> | 7 #include <stddef.h> | 
| 8 | 8 | 
| 9 #include <algorithm> | 9 #include <algorithm> | 
| 10 #include <map> | 10 #include <map> | 
| (...skipping 280 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 291   ash::ShelfID GetShelfIDForAppID(const std::string& app_id) override { | 291   ash::ShelfID GetShelfIDForAppID(const std::string& app_id) override { | 
| 292     return controller_->GetShelfIDForAppID(app_id); | 292     return controller_->GetShelfIDForAppID(app_id); | 
| 293   }; | 293   }; | 
| 294 | 294 | 
| 295   ash::ShelfID GetShelfIDForAppIDAndLaunchID( | 295   ash::ShelfID GetShelfIDForAppIDAndLaunchID( | 
| 296       const std::string& app_id, | 296       const std::string& app_id, | 
| 297       const std::string& launch_id) override { | 297       const std::string& launch_id) override { | 
| 298     return controller_->GetShelfIDForAppIDAndLaunchID(app_id, launch_id); | 298     return controller_->GetShelfIDForAppIDAndLaunchID(app_id, launch_id); | 
| 299   } | 299   } | 
| 300 | 300 | 
| 301   bool HasShelfIDToAppIDMapping(ash::ShelfID id) const override { |  | 
| 302     return controller_->HasShelfIDToAppIDMapping(id); |  | 
| 303   } |  | 
| 304 |  | 
| 305   const std::string& GetAppIDForShelfID(ash::ShelfID id) override { | 301   const std::string& GetAppIDForShelfID(ash::ShelfID id) override { | 
| 306     return controller_->GetAppIDForShelfID(id); | 302     return controller_->GetAppIDForShelfID(id); | 
| 307   } | 303   } | 
| 308 | 304 | 
| 309   void PinAppWithID(const std::string& app_id) override { | 305   void PinAppWithID(const std::string& app_id) override { | 
| 310     return controller_->PinAppWithID(app_id); | 306     return controller_->PinAppWithID(app_id); | 
| 311   } | 307   } | 
| 312 | 308 | 
| 313   bool IsAppPinned(const std::string& app_id) override { | 309   bool IsAppPinned(const std::string& app_id) override { | 
| 314     return controller_->IsAppPinned(app_id); | 310     return controller_->IsAppPinned(app_id); | 
| (...skipping 4109 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 4424   EXPECT_EQ(ash::SHELF_AUTO_HIDE_BEHAVIOR_ALWAYS, | 4420   EXPECT_EQ(ash::SHELF_AUTO_HIDE_BEHAVIOR_ALWAYS, | 
| 4425             shelf_controller->auto_hide()); | 4421             shelf_controller->auto_hide()); | 
| 4426   EXPECT_EQ(2u, shelf_controller->auto_hide_change_count()); | 4422   EXPECT_EQ(2u, shelf_controller->auto_hide_change_count()); | 
| 4427 | 4423 | 
| 4428   PrefService* prefs = profile()->GetTestingPrefService(); | 4424   PrefService* prefs = profile()->GetTestingPrefService(); | 
| 4429   EXPECT_EQ("Left", prefs->GetString(prefs::kShelfAlignmentLocal)); | 4425   EXPECT_EQ("Left", prefs->GetString(prefs::kShelfAlignmentLocal)); | 
| 4430   EXPECT_EQ("Left", prefs->GetString(prefs::kShelfAlignment)); | 4426   EXPECT_EQ("Left", prefs->GetString(prefs::kShelfAlignment)); | 
| 4431   EXPECT_EQ("Always", prefs->GetString(prefs::kShelfAutoHideBehaviorLocal)); | 4427   EXPECT_EQ("Always", prefs->GetString(prefs::kShelfAutoHideBehaviorLocal)); | 
| 4432   EXPECT_EQ("Always", prefs->GetString(prefs::kShelfAutoHideBehavior)); | 4428   EXPECT_EQ("Always", prefs->GetString(prefs::kShelfAutoHideBehavior)); | 
| 4433 } | 4429 } | 
| OLD | NEW | 
|---|