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

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

Issue 2741273002: chromeos: Promotes more from WmShell to Shell (Closed)
Patch Set: feedback 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 1138 matching lines...) Expand 10 before | Expand all | Expand 10 after
1149 new chromeos::FakeChromeUserManager)); 1149 new chromeos::FakeChromeUserManager));
1150 1150
1151 // Initialize the WallpaperManager singleton. 1151 // Initialize the WallpaperManager singleton.
1152 chromeos::WallpaperManager::Initialize(); 1152 chromeos::WallpaperManager::Initialize();
1153 1153
1154 // Initialize the rest. 1154 // Initialize the rest.
1155 ChromeLauncherControllerImplTest::SetUp(); 1155 ChromeLauncherControllerImplTest::SetUp();
1156 1156
1157 // Get some base objects. 1157 // Get some base objects.
1158 shell_delegate_ = static_cast<ash::test::TestShellDelegate*>( 1158 shell_delegate_ = static_cast<ash::test::TestShellDelegate*>(
1159 ash::WmShell::Get()->delegate()); 1159 ash::Shell::Get()->shell_delegate());
1160 shell_delegate_->set_multi_profiles_enabled(true); 1160 shell_delegate_->set_multi_profiles_enabled(true);
1161 } 1161 }
1162 1162
1163 void TearDown() override { 1163 void TearDown() override {
1164 ChromeLauncherControllerImplTest::TearDown(); 1164 ChromeLauncherControllerImplTest::TearDown();
1165 user_manager_enabler_.reset(); 1165 user_manager_enabler_.reset();
1166 for (ProfileToNameMap::iterator it = created_profiles_.begin(); 1166 for (ProfileToNameMap::iterator it = created_profiles_.begin();
1167 it != created_profiles_.end(); ++it) 1167 it != created_profiles_.end(); ++it)
1168 profile_manager_->DeleteTestingProfile(it->second); 1168 profile_manager_->DeleteTestingProfile(it->second);
1169 chromeos::WallpaperManager::Shutdown(); 1169 chromeos::WallpaperManager::Shutdown();
(...skipping 3132 matching lines...) Expand 10 before | Expand all | Expand 10 after
4302 EXPECT_EQ(ash::SHELF_AUTO_HIDE_BEHAVIOR_ALWAYS, 4302 EXPECT_EQ(ash::SHELF_AUTO_HIDE_BEHAVIOR_ALWAYS,
4303 shelf_controller->auto_hide()); 4303 shelf_controller->auto_hide());
4304 EXPECT_EQ(2u, shelf_controller->auto_hide_change_count()); 4304 EXPECT_EQ(2u, shelf_controller->auto_hide_change_count());
4305 4305
4306 PrefService* prefs = profile()->GetTestingPrefService(); 4306 PrefService* prefs = profile()->GetTestingPrefService();
4307 EXPECT_EQ("Left", prefs->GetString(prefs::kShelfAlignmentLocal)); 4307 EXPECT_EQ("Left", prefs->GetString(prefs::kShelfAlignmentLocal));
4308 EXPECT_EQ("Left", prefs->GetString(prefs::kShelfAlignment)); 4308 EXPECT_EQ("Left", prefs->GetString(prefs::kShelfAlignment));
4309 EXPECT_EQ("Always", prefs->GetString(prefs::kShelfAutoHideBehaviorLocal)); 4309 EXPECT_EQ("Always", prefs->GetString(prefs::kShelfAutoHideBehaviorLocal));
4310 EXPECT_EQ("Always", prefs->GetString(prefs::kShelfAutoHideBehavior)); 4310 EXPECT_EQ("Always", prefs->GetString(prefs::kShelfAutoHideBehavior));
4311 } 4311 }
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/login/ui/login_display_host_impl.cc ('k') | chrome/browser/ui/ash/launcher/launcher_context_menu.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698