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

Side by Side Diff: chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl_unittest.cc

Issue 2766543002: Move even more from WmShell to Shell (Closed)
Patch Set: 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 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 862 matching lines...) Expand 10 before | Expand all | Expand 10 after
873 873
874 // TODO(victorhsieh): Add test coverage for when ARC is started regardless 874 // TODO(victorhsieh): Add test coverage for when ARC is started regardless
875 // Play Store opt-in status, and the followed opt-in and opt-out. 875 // Play Store opt-in status, and the followed opt-in and opt-out.
876 void EnablePlayStore(bool enabled) { 876 void EnablePlayStore(bool enabled) {
877 arc::SetArcPlayStoreEnabledForProfile(profile(), enabled); 877 arc::SetArcPlayStoreEnabledForProfile(profile(), enabled);
878 base::RunLoop().RunUntilIdle(); 878 base::RunLoop().RunUntilIdle();
879 } 879 }
880 880
881 void EnableTabletMode(bool enable) { 881 void EnableTabletMode(bool enable) {
882 ash::MaximizeModeController* controller = 882 ash::MaximizeModeController* controller =
883 ash::WmShell::Get()->maximize_mode_controller(); 883 ash::Shell::Get()->maximize_mode_controller();
884 controller->EnableMaximizeModeWindowManager(enable); 884 controller->EnableMaximizeModeWindowManager(enable);
885 } 885 }
886 886
887 void ValidateArcState(bool arc_enabled, 887 void ValidateArcState(bool arc_enabled,
888 bool arc_managed, 888 bool arc_managed,
889 arc::ArcSessionManager::State state, 889 arc::ArcSessionManager::State state,
890 const std::string& pin_status) { 890 const std::string& pin_status) {
891 EXPECT_EQ(arc_enabled, arc::IsArcPlayStoreEnabledForProfile(profile())); 891 EXPECT_EQ(arc_enabled, arc::IsArcPlayStoreEnabledForProfile(profile()));
892 EXPECT_EQ(arc_managed, 892 EXPECT_EQ(arc_managed,
893 arc::IsArcPlayStoreEnabledPreferenceManagedForProfile(profile())); 893 arc::IsArcPlayStoreEnabledPreferenceManagedForProfile(profile()));
(...skipping 3457 matching lines...) Expand 10 before | Expand all | Expand 10 after
4351 EXPECT_EQ(ash::SHELF_AUTO_HIDE_BEHAVIOR_ALWAYS, 4351 EXPECT_EQ(ash::SHELF_AUTO_HIDE_BEHAVIOR_ALWAYS,
4352 shelf_controller->auto_hide()); 4352 shelf_controller->auto_hide());
4353 EXPECT_EQ(2u, shelf_controller->auto_hide_change_count()); 4353 EXPECT_EQ(2u, shelf_controller->auto_hide_change_count());
4354 4354
4355 PrefService* prefs = profile()->GetTestingPrefService(); 4355 PrefService* prefs = profile()->GetTestingPrefService();
4356 EXPECT_EQ("Left", prefs->GetString(prefs::kShelfAlignmentLocal)); 4356 EXPECT_EQ("Left", prefs->GetString(prefs::kShelfAlignmentLocal));
4357 EXPECT_EQ("Left", prefs->GetString(prefs::kShelfAlignment)); 4357 EXPECT_EQ("Left", prefs->GetString(prefs::kShelfAlignment));
4358 EXPECT_EQ("Always", prefs->GetString(prefs::kShelfAutoHideBehaviorLocal)); 4358 EXPECT_EQ("Always", prefs->GetString(prefs::kShelfAutoHideBehaviorLocal));
4359 EXPECT_EQ("Always", prefs->GetString(prefs::kShelfAutoHideBehavior)); 4359 EXPECT_EQ("Always", prefs->GetString(prefs::kShelfAutoHideBehavior));
4360 } 4360 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698