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

Unified Diff: wm/test/test_shell_delegate.h

Issue 11485006: Add window manager component. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Push gfx::AcceleratedWidget usage into platform specific code. Created 7 years, 10 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « wm/shell/shell_main_parts.cc ('k') | wm/test/test_shell_delegate.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: wm/test/test_shell_delegate.h
diff --git a/ash/shell/shell_delegate_impl.h b/wm/test/test_shell_delegate.h
similarity index 66%
copy from ash/shell/shell_delegate_impl.h
copy to wm/test/test_shell_delegate.h
index 2f1bc20ea13676407cd467740e2e42c3e9620f0f..cf3cb53dab921b030788902445586974572928e0 100644
--- a/ash/shell/shell_delegate_impl.h
+++ b/wm/test/test_shell_delegate.h
@@ -1,26 +1,23 @@
-// 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_TEST_TEST_SHELL_DELEGATE_H_
+#define WM_TEST_TEST_SHELL_DELEGATE_H_
#include "ash/shell_delegate.h"
#include "base/compiler_specific.h"
+#include "base/memory/scoped_ptr.h"
-namespace ash {
-namespace shell {
+namespace wm {
+namespace test {
-class LauncherDelegateImpl;
-class WindowWatcher;
-
-class ShellDelegateImpl : public ash::ShellDelegate {
+class TestShellDelegate : public ash::ShellDelegate {
public:
- ShellDelegateImpl();
- virtual ~ShellDelegateImpl();
-
- void SetWatcher(WindowWatcher* watcher);
+ TestShellDelegate();
+ virtual ~TestShellDelegate();
+ // Overridden from ShellDelegate:
virtual bool IsUserLoggedIn() const OVERRIDE;
virtual bool IsSessionStarted() const OVERRIDE;
virtual bool IsFirstRunAfterBoot() const OVERRIDE;
@@ -37,19 +34,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 +56,7 @@ 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;
@@ -67,27 +64,20 @@ class ShellDelegateImpl : public ash::ShellDelegate {
virtual string16 GetTimeDurationLongString(base::TimeDelta delta) OVERRIDE;
virtual void SaveScreenMagnifierScale(double scale) OVERRIDE;
virtual double GetSavedScreenMagnifierScale() OVERRIDE;
- virtual ui::MenuModel* CreateContextMenu(
- aura::RootWindow* root_window) OVERRIDE;
- virtual RootWindowHostFactory* CreateRootWindowHostFactory() OVERRIDE;
+ virtual ui::MenuModel* CreateContextMenu(aura::RootWindow* root) OVERRIDE;
+ virtual ash::RootWindowHostFactory* CreateRootWindowHostFactory() OVERRIDE;
virtual string16 GetProductName() const OVERRIDE;
private:
- // Used to update Launcher. Owned by main.
- WindowWatcher* watcher_;
-
- 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_;
+
+ scoped_ptr<content::BrowserContext> current_browser_context_;
- DISALLOW_COPY_AND_ASSIGN(ShellDelegateImpl);
+ DISALLOW_COPY_AND_ASSIGN(TestShellDelegate);
};
-} // namespace shell
-} // namespace ash
+} // namespace test
+} // namespace wm
-#endif // ASH_SHELL_SHELL_DELEGATE_IMPL_H_
+#endif // WM_TEST_TEST_SHELL_DELEGATE_H_
« no previous file with comments | « wm/shell/shell_main_parts.cc ('k') | wm/test/test_shell_delegate.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698