chrome/browser/ui/views/ash/chrome_shell_delegate.h - Issue 10191010: Re-implement the screensaver to use WebView instead of ExtensionDialogHost.

Side by Side Diff: chrome/browser/ui/views/ash/chrome_shell_delegate.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: . 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

« ash/screensaver/screensaver_view_unittest.cc ('K') | « chrome/browser/chromeos/ui/screensaver_extension_dialog.cc ('k') | chrome/browser/ui/views/ash/chrome_shell_delegate.cc » ('j') | content/test/test_content_client_initializer.h » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 CHROME_BROWSER_UI_VIEWS_ASH_CHROME_SHELL_DELEGATE_H_	5 #ifndef CHROME_BROWSER_UI_VIEWS_ASH_CHROME_SHELL_DELEGATE_H_

6 #define CHROME_BROWSER_UI_VIEWS_ASH_CHROME_SHELL_DELEGATE_H_	6 #define CHROME_BROWSER_UI_VIEWS_ASH_CHROME_SHELL_DELEGATE_H_

7 #pragma once	7 #pragma once

8	8

9 #include "ash/launcher/launcher_types.h"	9 #include "ash/launcher/launcher_types.h"

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

(...skipping 24 matching lines...) Expand all Loading...
35 virtual void LockScreen() OVERRIDE;	35 virtual void LockScreen() OVERRIDE;

36 virtual void UnlockScreen() OVERRIDE;	36 virtual void UnlockScreen() OVERRIDE;

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

38 virtual void Shutdown() OVERRIDE;	38 virtual void Shutdown() OVERRIDE;

39 virtual void Exit() OVERRIDE;	39 virtual void Exit() OVERRIDE;

40 virtual void NewWindow(bool is_incognito) OVERRIDE;	40 virtual void NewWindow(bool is_incognito) OVERRIDE;

41 virtual void Search() OVERRIDE;	41 virtual void Search() OVERRIDE;

42 virtual void OpenFileManager() OVERRIDE;	42 virtual void OpenFileManager() OVERRIDE;

43 virtual void OpenCrosh() OVERRIDE;	43 virtual void OpenCrosh() OVERRIDE;

44 virtual void OpenMobileSetup() OVERRIDE;	44 virtual void OpenMobileSetup() OVERRIDE;

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

45 virtual ash::AppListViewDelegate* CreateAppListViewDelegate() OVERRIDE;	46 virtual ash::AppListViewDelegate* CreateAppListViewDelegate() OVERRIDE;

46 virtual void StartPartialScreenshot(	47 virtual void StartPartialScreenshot(

47 ash::ScreenshotDelegate* screenshot_delegate) OVERRIDE;	48 ash::ScreenshotDelegate* screenshot_delegate) OVERRIDE;

48 virtual ash::LauncherDelegate* CreateLauncherDelegate(	49 virtual ash::LauncherDelegate* CreateLauncherDelegate(

49 ash::LauncherModel* model) OVERRIDE;	50 ash::LauncherModel* model) OVERRIDE;

50 virtual ash::SystemTrayDelegate* CreateSystemTrayDelegate(	51 virtual ash::SystemTrayDelegate* CreateSystemTrayDelegate(

51 ash::SystemTray* tray) OVERRIDE;	52 ash::SystemTray* tray) OVERRIDE;

52 virtual ash::UserWallpaperDelegate* CreateUserWallpaperDelegate() OVERRIDE;	53 virtual ash::UserWallpaperDelegate* CreateUserWallpaperDelegate() OVERRIDE;

53	54

54 // content::NotificationObserver override:	55 // content::NotificationObserver override:

55 virtual void Observe(int type,	56 virtual void Observe(int type,

56 const content::NotificationSource& source,	57 const content::NotificationSource& source,

57 const content::NotificationDetails& details) OVERRIDE;	58 const content::NotificationDetails& details) OVERRIDE;

58	59

59 private:	60 private:

60 static ChromeShellDelegate* instance_;	61 static ChromeShellDelegate* instance_;

61	62

62 content::NotificationRegistrar registrar_;	63 content::NotificationRegistrar registrar_;

63	64

64 scoped_ptr<WindowPositioner> window_positioner_;	65 scoped_ptr<WindowPositioner> window_positioner_;

65	66

66 base::WeakPtrFactory<ChromeShellDelegate> weak_factory_;	67 base::WeakPtrFactory<ChromeShellDelegate> weak_factory_;

67	68

68 DISALLOW_COPY_AND_ASSIGN(ChromeShellDelegate);	69 DISALLOW_COPY_AND_ASSIGN(ChromeShellDelegate);

69 };	70 };

70	71

71 #endif // CHROME_BROWSER_UI_VIEWS_ASH_CHROME_SHELL_DELEGATE_H_	72 #endif // CHROME_BROWSER_UI_VIEWS_ASH_CHROME_SHELL_DELEGATE_H_

OLD	NEW