| Index: wm/test/test_shell_delegate.cc
|
| diff --git a/ash/test/test_shell_delegate.cc b/wm/test/test_shell_delegate.cc
|
| similarity index 58%
|
| copy from ash/test/test_shell_delegate.cc
|
| copy to wm/test/test_shell_delegate.cc
|
| index 5c1946cf6f1403edc7d1ebe2e0f07eb7b89f8fcc..e1cacbb59ab8eadbfcf264c61c196f7856006476 100644
|
| --- a/ash/test/test_shell_delegate.cc
|
| +++ b/wm/test/test_shell_delegate.cc
|
| @@ -1,44 +1,31 @@
|
| -// Copyright (c) 2012 The Chromium Authors. All rights reserved.
|
| +// Copyright (c) 2013 The Chromium Authors. All rights reserved.
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#include "ash/test/test_shell_delegate.h"
|
| -
|
| -#include <algorithm>
|
| +#include "wm/test/test_shell_delegate.h"
|
|
|
| #include "ash/caps_lock_delegate_stub.h"
|
| -#include "ash/host/root_window_host_factory.h"
|
| -#include "ash/shell.h"
|
| -#include "ash/shell_window_ids.h"
|
| #include "ash/test/test_launcher_delegate.h"
|
| -#include "ash/wm/window_util.h"
|
| #include "content/public/test/test_browser_context.h"
|
| -#include "ui/aura/window.h"
|
| +#include "wm/host/root_window_host_factory.h"
|
|
|
| -namespace ash {
|
| +namespace wm {
|
| namespace test {
|
|
|
| TestShellDelegate::TestShellDelegate()
|
| - : locked_(false),
|
| - session_started_(true),
|
| - spoken_feedback_enabled_(false),
|
| - high_contrast_enabled_(false),
|
| - screen_magnifier_enabled_(false),
|
| - screen_magnifier_type_(kDefaultMagnifierType),
|
| - user_logged_in_(true),
|
| - can_lock_screen_(true),
|
| - num_exit_requests_(0) {
|
| + : screen_magnifier_enabled_(false),
|
| + screen_magnifier_type_(ash::kDefaultMagnifierType) {
|
| }
|
|
|
| TestShellDelegate::~TestShellDelegate() {
|
| }
|
|
|
| bool TestShellDelegate::IsUserLoggedIn() const {
|
| - return user_logged_in_;
|
| + return true;
|
| }
|
|
|
| bool TestShellDelegate::IsSessionStarted() const {
|
| - return session_started_;
|
| + return true;
|
| }
|
|
|
| bool TestShellDelegate::IsFirstRunAfterBoot() const {
|
| @@ -46,26 +33,23 @@ bool TestShellDelegate::IsFirstRunAfterBoot() const {
|
| }
|
|
|
| bool TestShellDelegate::CanLockScreen() const {
|
| - return user_logged_in_ && can_lock_screen_;
|
| + return false;
|
| }
|
|
|
| void TestShellDelegate::LockScreen() {
|
| - locked_ = true;
|
| }
|
|
|
| void TestShellDelegate::UnlockScreen() {
|
| - locked_ = false;
|
| }
|
|
|
| bool TestShellDelegate::IsScreenLocked() const {
|
| - return locked_;
|
| + return false;
|
| }
|
|
|
| void TestShellDelegate::Shutdown() {
|
| }
|
|
|
| void TestShellDelegate::Exit() {
|
| - num_exit_requests_++;
|
| }
|
|
|
| void TestShellDelegate::NewTab() {
|
| @@ -75,9 +59,6 @@ void TestShellDelegate::NewWindow(bool incognito) {
|
| }
|
|
|
| void TestShellDelegate::ToggleMaximized() {
|
| - aura::Window* window = ash::wm::GetActiveWindow();
|
| - if (window)
|
| - ash::wm::ToggleMaximizedWindow(window);
|
| }
|
|
|
| void TestShellDelegate::OpenFileManager() {
|
| @@ -92,7 +73,7 @@ void TestShellDelegate::OpenMobileSetup(const std::string& service_path) {
|
| void TestShellDelegate::RestoreTab() {
|
| }
|
|
|
| -bool TestShellDelegate::RotatePaneFocus(Shell::Direction direction) {
|
| +bool TestShellDelegate::RotatePaneFocus(ash::Shell::Direction direction) {
|
| return true;
|
| }
|
|
|
| @@ -108,27 +89,25 @@ content::BrowserContext* TestShellDelegate::GetCurrentBrowserContext() {
|
| }
|
|
|
| void TestShellDelegate::ToggleSpokenFeedback(
|
| - AccessibilityNotificationVisibility notify) {
|
| - spoken_feedback_enabled_ = !spoken_feedback_enabled_;
|
| + ash::AccessibilityNotificationVisibility notify) {
|
| }
|
|
|
| bool TestShellDelegate::IsSpokenFeedbackEnabled() const {
|
| - return spoken_feedback_enabled_;
|
| + return false;
|
| }
|
|
|
| void TestShellDelegate::ToggleHighContrast() {
|
| - high_contrast_enabled_ = !high_contrast_enabled_;
|
| }
|
|
|
| bool TestShellDelegate::IsHighContrastEnabled() const {
|
| - return high_contrast_enabled_;
|
| + return false;
|
| }
|
|
|
| void TestShellDelegate::SetMagnifierEnabled(bool enabled) {
|
| screen_magnifier_enabled_ = enabled;
|
| }
|
|
|
| -void TestShellDelegate::SetMagnifierType(MagnifierType type) {
|
| +void TestShellDelegate::SetMagnifierType(ash::MagnifierType type) {
|
| screen_magnifier_type_ = type;
|
| }
|
|
|
| @@ -136,7 +115,7 @@ bool TestShellDelegate::IsMagnifierEnabled() const {
|
| return screen_magnifier_enabled_;
|
| }
|
|
|
| -MagnifierType TestShellDelegate::GetMagnifierType() const {
|
| +ash::MagnifierType TestShellDelegate::GetMagnifierType() const {
|
| return screen_magnifier_type_;
|
| }
|
|
|
| @@ -148,21 +127,21 @@ app_list::AppListViewDelegate* TestShellDelegate::CreateAppListViewDelegate() {
|
| return NULL;
|
| }
|
|
|
| -LauncherDelegate* TestShellDelegate::CreateLauncherDelegate(
|
| +ash::LauncherDelegate* TestShellDelegate::CreateLauncherDelegate(
|
| ash::LauncherModel* model) {
|
| - return new TestLauncherDelegate(model);
|
| + return new ash::test::TestLauncherDelegate(model);
|
| }
|
|
|
| -SystemTrayDelegate* TestShellDelegate::CreateSystemTrayDelegate() {
|
| +ash::SystemTrayDelegate* TestShellDelegate::CreateSystemTrayDelegate() {
|
| return NULL;
|
| }
|
|
|
| -UserWallpaperDelegate* TestShellDelegate::CreateUserWallpaperDelegate() {
|
| +ash::UserWallpaperDelegate* TestShellDelegate::CreateUserWallpaperDelegate() {
|
| return NULL;
|
| }
|
|
|
| -CapsLockDelegate* TestShellDelegate::CreateCapsLockDelegate() {
|
| - return new CapsLockDelegateStub;
|
| +ash::CapsLockDelegate* TestShellDelegate::CreateCapsLockDelegate() {
|
| + return new ash::CapsLockDelegateStub;
|
| }
|
|
|
| aura::client::UserActionClient* TestShellDelegate::CreateUserActionClient() {
|
| @@ -172,7 +151,8 @@ aura::client::UserActionClient* TestShellDelegate::CreateUserActionClient() {
|
| void TestShellDelegate::OpenFeedbackPage() {
|
| }
|
|
|
| -void TestShellDelegate::RecordUserMetricsAction(UserMetricsAction action) {
|
| +void TestShellDelegate::RecordUserMetricsAction(
|
| + ash::UserMetricsAction action) {
|
| }
|
|
|
| void TestShellDelegate::HandleMediaNextTrack() {
|
| @@ -203,30 +183,13 @@ double TestShellDelegate::GetSavedScreenMagnifierScale() {
|
| return std::numeric_limits<double>::min();
|
| }
|
|
|
| -RootWindowHostFactory* TestShellDelegate::CreateRootWindowHostFactory() {
|
| +ash::RootWindowHostFactory* TestShellDelegate::CreateRootWindowHostFactory() {
|
| return RootWindowHostFactory::Create();
|
| }
|
|
|
| -void TestShellDelegate::SetSessionStarted(bool session_started) {
|
| - session_started_ = session_started;
|
| - if (session_started)
|
| - user_logged_in_ = true;
|
| -}
|
| -
|
| -void TestShellDelegate::SetUserLoggedIn(bool user_logged_in) {
|
| - user_logged_in_ = user_logged_in;
|
| - if (!user_logged_in)
|
| - session_started_ = false;
|
| -}
|
| -
|
| -void TestShellDelegate::SetCanLockScreen(bool can_lock_screen) {
|
| - can_lock_screen_ = can_lock_screen;
|
| -}
|
| -
|
| string16 TestShellDelegate::GetProductName() const {
|
| return string16();
|
| }
|
|
|
| -
|
| } // namespace test
|
| -} // namespace ash
|
| +} // namespace wm
|
|
|