| Index: wm/shell/shell_delegate_impl.h
|
| diff --git a/ash/shell/shell_delegate_impl.h b/wm/shell/shell_delegate_impl.h
|
| similarity index 76%
|
| copy from ash/shell/shell_delegate_impl.h
|
| copy to wm/shell/shell_delegate_impl.h
|
| index 2f1bc20ea13676407cd467740e2e42c3e9620f0f..81e86455f1bf124f9052d94ddfa173ed9c0367a0 100644
|
| --- a/ash/shell/shell_delegate_impl.h
|
| +++ b/wm/shell/shell_delegate_impl.h
|
| @@ -1,9 +1,9 @@
|
| -// 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.
|
|
|
| -#ifndef ASH_SHELL_SHELL_DELEGATE_IMPL_H_
|
| -#define ASH_SHELL_SHELL_DELEGATE_IMPL_H_
|
| +#ifndef WM_SHELL_SHELL_DELEGATE_IMPL_H_
|
| +#define WM_SHELL_SHELL_DELEGATE_IMPL_H_
|
|
|
| #include "ash/shell_delegate.h"
|
| #include "base/compiler_specific.h"
|
| @@ -14,12 +14,18 @@ namespace shell {
|
| class LauncherDelegateImpl;
|
| class WindowWatcher;
|
|
|
| +} // namespace shell
|
| +} // namespace ash
|
| +
|
| +namespace wm {
|
| +namespace shell {
|
| +
|
| class ShellDelegateImpl : public ash::ShellDelegate {
|
| public:
|
| ShellDelegateImpl();
|
| virtual ~ShellDelegateImpl();
|
|
|
| - void SetWatcher(WindowWatcher* watcher);
|
| + void SetWatcher(ash::shell::WindowWatcher* watcher);
|
|
|
| virtual bool IsUserLoggedIn() const OVERRIDE;
|
| virtual bool IsSessionStarted() const OVERRIDE;
|
| @@ -37,19 +43,19 @@ class ShellDelegateImpl : public ash::ShellDelegate {
|
| virtual void OpenCrosh() OVERRIDE;
|
| virtual void OpenMobileSetup(const std::string& service_path) OVERRIDE;
|
| virtual void RestoreTab() OVERRIDE;
|
| - virtual bool RotatePaneFocus(Shell::Direction direction) OVERRIDE;
|
| + virtual bool RotatePaneFocus(ash::Shell::Direction direction) OVERRIDE;
|
| virtual void ShowKeyboardOverlay() OVERRIDE;
|
| virtual void ShowTaskManager() OVERRIDE;
|
| virtual content::BrowserContext* GetCurrentBrowserContext() OVERRIDE;
|
| virtual void ToggleSpokenFeedback(
|
| - AccessibilityNotificationVisibility notify) OVERRIDE;
|
| + ash::AccessibilityNotificationVisibility notify) OVERRIDE;
|
| virtual bool IsSpokenFeedbackEnabled() const OVERRIDE;
|
| virtual void ToggleHighContrast() OVERRIDE;
|
| virtual bool IsHighContrastEnabled() const OVERRIDE;
|
| virtual void SetMagnifierEnabled(bool enabled) OVERRIDE;
|
| - virtual void SetMagnifierType(MagnifierType type) OVERRIDE;
|
| + virtual void SetMagnifierType(ash::MagnifierType type) OVERRIDE;
|
| virtual bool IsMagnifierEnabled() const OVERRIDE;
|
| - virtual MagnifierType GetMagnifierType() const OVERRIDE;
|
| + virtual ash::MagnifierType GetMagnifierType() const OVERRIDE;
|
| virtual bool ShouldAlwaysShowAccessibilityMenu() const OVERRIDE;
|
| virtual app_list::AppListViewDelegate* CreateAppListViewDelegate() OVERRIDE;
|
| virtual ash::LauncherDelegate* CreateLauncherDelegate(
|
| @@ -59,7 +65,8 @@ class ShellDelegateImpl : public ash::ShellDelegate {
|
| virtual ash::CapsLockDelegate* CreateCapsLockDelegate() OVERRIDE;
|
| virtual aura::client::UserActionClient* CreateUserActionClient() OVERRIDE;
|
| virtual void OpenFeedbackPage() OVERRIDE;
|
| - virtual void RecordUserMetricsAction(UserMetricsAction action) OVERRIDE;
|
| + virtual void RecordUserMetricsAction(
|
| + ash::UserMetricsAction action) OVERRIDE;
|
| virtual void HandleMediaNextTrack() OVERRIDE;
|
| virtual void HandleMediaPlayPause() OVERRIDE;
|
| virtual void HandleMediaPrevTrack() OVERRIDE;
|
| @@ -69,25 +76,25 @@ class ShellDelegateImpl : public ash::ShellDelegate {
|
| virtual double GetSavedScreenMagnifierScale() OVERRIDE;
|
| virtual ui::MenuModel* CreateContextMenu(
|
| aura::RootWindow* root_window) OVERRIDE;
|
| - virtual RootWindowHostFactory* CreateRootWindowHostFactory() OVERRIDE;
|
| + virtual ash::RootWindowHostFactory* CreateRootWindowHostFactory() OVERRIDE;
|
| virtual string16 GetProductName() const OVERRIDE;
|
|
|
| private:
|
| // Used to update Launcher. Owned by main.
|
| - WindowWatcher* watcher_;
|
| + ash::shell::WindowWatcher* watcher_;
|
|
|
| - LauncherDelegateImpl* launcher_delegate_;
|
| + ash::shell::LauncherDelegateImpl* launcher_delegate_;
|
|
|
| bool locked_;
|
| bool spoken_feedback_enabled_;
|
| bool high_contrast_enabled_;
|
| bool screen_magnifier_enabled_;
|
| - MagnifierType screen_magnifier_type_;
|
| + ash::MagnifierType screen_magnifier_type_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(ShellDelegateImpl);
|
| };
|
|
|
| } // namespace shell
|
| -} // namespace ash
|
| +} // namespace wm
|
|
|
| -#endif // ASH_SHELL_SHELL_DELEGATE_IMPL_H_
|
| +#endif // WM_SHELL_SHELL_DELEGATE_IMPL_H_
|
|
|