ash/shell/shell_delegate_impl.h - Issue 10191010: Re-implement the screensaver to use WebView instead of ExtensionDialogHost.

Side by Side Diff: ash/shell/shell_delegate_impl.h

Issue 10191010: Re-implement the screensaver to use WebView instead of ExtensionDialogHost. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: ut fix. Created 8 years, 7 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 | Annotate | Revision Log

« no previous file with comments | « ash/screensaver/screensaver_view_unittest.cc ('k') | ash/shell/shell_delegate_impl.cc » ('j') | no next file with comments »

OLD	NEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2012 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 #ifndef ASH_SHELL_SHELL_DELEGATE_IMPL_H_	5 #ifndef ASH_SHELL_SHELL_DELEGATE_IMPL_H_

6 #define ASH_SHELL_SHELL_DELEGATE_IMPL_H_	6 #define ASH_SHELL_SHELL_DELEGATE_IMPL_H_

7 #pragma once	7 #pragma once

8	8

9 #include "ash/shell_delegate.h"	9 #include "ash/shell_delegate.h"

10 #include "base/compiler_specific.h"	10 #include "base/compiler_specific.h"

(...skipping 15 matching lines...) Expand all Loading...
26 virtual void LockScreen() OVERRIDE;	26 virtual void LockScreen() OVERRIDE;

27 virtual void UnlockScreen() OVERRIDE;	27 virtual void UnlockScreen() OVERRIDE;

28 virtual bool IsScreenLocked() const OVERRIDE;	28 virtual bool IsScreenLocked() const OVERRIDE;

29 virtual void Shutdown() OVERRIDE;	29 virtual void Shutdown() OVERRIDE;

30 virtual void Exit() OVERRIDE;	30 virtual void Exit() OVERRIDE;

31 virtual void NewWindow(bool incognito) OVERRIDE;	31 virtual void NewWindow(bool incognito) OVERRIDE;

32 virtual void Search() OVERRIDE;	32 virtual void Search() OVERRIDE;

33 virtual void OpenFileManager() OVERRIDE;	33 virtual void OpenFileManager() OVERRIDE;

34 virtual void OpenCrosh() OVERRIDE;	34 virtual void OpenCrosh() OVERRIDE;

35 virtual void OpenMobileSetup() OVERRIDE;	35 virtual void OpenMobileSetup() OVERRIDE;

	36 virtual content::BrowserContext* GetCurrentBrowserContext() OVERRIDE;

36 virtual void ToggleSpokenFeedback() OVERRIDE;	37 virtual void ToggleSpokenFeedback() OVERRIDE;

37 virtual ash::AppListViewDelegate* CreateAppListViewDelegate() OVERRIDE;	38 virtual ash::AppListViewDelegate* CreateAppListViewDelegate() OVERRIDE;

38 virtual void StartPartialScreenshot(	39 virtual void StartPartialScreenshot(

39 ash::ScreenshotDelegate* screenshot_delegate) OVERRIDE;	40 ash::ScreenshotDelegate* screenshot_delegate) OVERRIDE;

40 virtual ash::LauncherDelegate* CreateLauncherDelegate(	41 virtual ash::LauncherDelegate* CreateLauncherDelegate(

41 ash::LauncherModel* model) OVERRIDE;	42 ash::LauncherModel* model) OVERRIDE;

42 virtual ash::SystemTrayDelegate* CreateSystemTrayDelegate(	43 virtual ash::SystemTrayDelegate* CreateSystemTrayDelegate(

43 ash::SystemTray* tray) OVERRIDE;	44 ash::SystemTray* tray) OVERRIDE;

44 virtual ash::UserWallpaperDelegate* CreateUserWallpaperDelegate() OVERRIDE;	45 virtual ash::UserWallpaperDelegate* CreateUserWallpaperDelegate() OVERRIDE;

45	46

46 private:	47 private:

47 // Used to update Launcher. Owned by main.	48 // Used to update Launcher. Owned by main.

48 WindowWatcher* watcher_;	49 WindowWatcher* watcher_;

49	50

50 LauncherDelegateImpl* launcher_delegate_;	51 LauncherDelegateImpl* launcher_delegate_;

51	52

52 bool locked_;	53 bool locked_;

53	54

54 DISALLOW_COPY_AND_ASSIGN(ShellDelegateImpl);	55 DISALLOW_COPY_AND_ASSIGN(ShellDelegateImpl);

55 };	56 };

56	57

57 } // namespace shell	58 } // namespace shell

58 } // namespace ash	59 } // namespace ash

59	60

60 #endif // ASH_SHELL_SHELL_DELEGATE_IMPL_H_	61 #endif // ASH_SHELL_SHELL_DELEGATE_IMPL_H_

OLD	NEW