| 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 814 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 825 | 825 |
| 826 void UninstallArcApps() { | 826 void UninstallArcApps() { |
| 827 arc_test_.app_instance()->RefreshAppList(); | 827 arc_test_.app_instance()->RefreshAppList(); |
| 828 arc_test_.app_instance()->SendRefreshAppList( | 828 arc_test_.app_instance()->SendRefreshAppList( |
| 829 std::vector<arc::mojom::AppInfo>()); | 829 std::vector<arc::mojom::AppInfo>()); |
| 830 } | 830 } |
| 831 | 831 |
| 832 void EnableArc(bool enable) { | 832 void EnableArc(bool enable) { |
| 833 enable ? arc_test_.arc_session_manager()->EnableArc() | 833 enable ? arc_test_.arc_session_manager()->EnableArc() |
| 834 : arc_test_.arc_session_manager()->DisableArc(); | 834 : arc_test_.arc_session_manager()->DisableArc(); |
| 835 arc_test_.arc_session_manager()->OnSyncedPrefChanged(prefs::kArcEnabled, | |
| 836 false); | |
| 837 base::RunLoop().RunUntilIdle(); | 835 base::RunLoop().RunUntilIdle(); |
| 838 } | 836 } |
| 839 | 837 |
| 840 void EnableTabletMode(bool enable) { | 838 void EnableTabletMode(bool enable) { |
| 841 ash::MaximizeModeController* controller = | 839 ash::MaximizeModeController* controller = |
| 842 ash::WmShell::Get()->maximize_mode_controller(); | 840 ash::WmShell::Get()->maximize_mode_controller(); |
| 843 controller->EnableMaximizeModeWindowManager(enable); | 841 controller->EnableMaximizeModeWindowManager(enable); |
| 844 } | 842 } |
| 845 | 843 |
| 846 void ValidateArcState(bool arc_enabled, | 844 void ValidateArcState(bool arc_enabled, |
| (...skipping 3437 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4284 EXPECT_EQ(ash::SHELF_AUTO_HIDE_BEHAVIOR_ALWAYS, | 4282 EXPECT_EQ(ash::SHELF_AUTO_HIDE_BEHAVIOR_ALWAYS, |
| 4285 shelf_controller->auto_hide()); | 4283 shelf_controller->auto_hide()); |
| 4286 EXPECT_EQ(2u, shelf_controller->auto_hide_change_count()); | 4284 EXPECT_EQ(2u, shelf_controller->auto_hide_change_count()); |
| 4287 | 4285 |
| 4288 PrefService* prefs = profile()->GetTestingPrefService(); | 4286 PrefService* prefs = profile()->GetTestingPrefService(); |
| 4289 EXPECT_EQ("Left", prefs->GetString(prefs::kShelfAlignmentLocal)); | 4287 EXPECT_EQ("Left", prefs->GetString(prefs::kShelfAlignmentLocal)); |
| 4290 EXPECT_EQ("Left", prefs->GetString(prefs::kShelfAlignment)); | 4288 EXPECT_EQ("Left", prefs->GetString(prefs::kShelfAlignment)); |
| 4291 EXPECT_EQ("Always", prefs->GetString(prefs::kShelfAutoHideBehaviorLocal)); | 4289 EXPECT_EQ("Always", prefs->GetString(prefs::kShelfAutoHideBehaviorLocal)); |
| 4292 EXPECT_EQ("Always", prefs->GetString(prefs::kShelfAutoHideBehavior)); | 4290 EXPECT_EQ("Always", prefs->GetString(prefs::kShelfAutoHideBehavior)); |
| 4293 } | 4291 } |
| OLD | NEW |