ash/test/test_shell_delegate.h - Issue 37733003: Make GetRootWindow() return a Window instead of a RootWindow.

Side by Side Diff: ash/test/test_shell_delegate.h

Issue 37733003: Make GetRootWindow() return a Window instead of a RootWindow. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase Created 7 years, 1 month 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/test/test_launcher_item_delegate.cc ('k') | ash/test/test_shell_delegate.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_TEST_TEST_SHELL_DELEGATE_H_	5 #ifndef ASH_TEST_TEST_SHELL_DELEGATE_H_

6 #define ASH_TEST_TEST_SHELL_DELEGATE_H_	6 #define ASH_TEST_TEST_SHELL_DELEGATE_H_

7	7

8 #include <string>	8 #include <string>

9	9

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

(...skipping 36 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
47 virtual UserWallpaperDelegate* CreateUserWallpaperDelegate() OVERRIDE;	47 virtual UserWallpaperDelegate* CreateUserWallpaperDelegate() OVERRIDE;

48 virtual CapsLockDelegate* CreateCapsLockDelegate() OVERRIDE;	48 virtual CapsLockDelegate* CreateCapsLockDelegate() OVERRIDE;

49 virtual SessionStateDelegate* CreateSessionStateDelegate() OVERRIDE;	49 virtual SessionStateDelegate* CreateSessionStateDelegate() OVERRIDE;

50 virtual AccessibilityDelegate* CreateAccessibilityDelegate() OVERRIDE;	50 virtual AccessibilityDelegate* CreateAccessibilityDelegate() OVERRIDE;

51 virtual NewWindowDelegate* CreateNewWindowDelegate() OVERRIDE;	51 virtual NewWindowDelegate* CreateNewWindowDelegate() OVERRIDE;

52 virtual aura::client::UserActionClient* CreateUserActionClient() OVERRIDE;	52 virtual aura::client::UserActionClient* CreateUserActionClient() OVERRIDE;

53 virtual void RecordUserMetricsAction(UserMetricsAction action) OVERRIDE;	53 virtual void RecordUserMetricsAction(UserMetricsAction action) OVERRIDE;

54 virtual void HandleMediaNextTrack() OVERRIDE;	54 virtual void HandleMediaNextTrack() OVERRIDE;

55 virtual void HandleMediaPlayPause() OVERRIDE;	55 virtual void HandleMediaPlayPause() OVERRIDE;

56 virtual void HandleMediaPrevTrack() OVERRIDE;	56 virtual void HandleMediaPrevTrack() OVERRIDE;

57 virtual ui::MenuModel* CreateContextMenu(aura::RootWindow* root) OVERRIDE;	57 virtual ui::MenuModel* CreateContextMenu(aura::Window* root) OVERRIDE;

58 virtual RootWindowHostFactory* CreateRootWindowHostFactory() OVERRIDE;	58 virtual RootWindowHostFactory* CreateRootWindowHostFactory() OVERRIDE;

59 virtual base::string16 GetProductName() const OVERRIDE;	59 virtual base::string16 GetProductName() const OVERRIDE;

60	60

61 int num_exit_requests() const { return num_exit_requests_; }	61 int num_exit_requests() const { return num_exit_requests_; }

62	62

63 TestSessionStateDelegate* test_session_state_delegate();	63 TestSessionStateDelegate* test_session_state_delegate();

64	64

65 private:	65 private:

66 int num_exit_requests_;	66 int num_exit_requests_;

67 bool multi_profiles_enabled_;	67 bool multi_profiles_enabled_;

68	68

69 scoped_ptr<content::BrowserContext> current_browser_context_;	69 scoped_ptr<content::BrowserContext> current_browser_context_;

70	70

71 TestSessionStateDelegate* test_session_state_delegate_; // Not owned.	71 TestSessionStateDelegate* test_session_state_delegate_; // Not owned.

72	72

73 DISALLOW_COPY_AND_ASSIGN(TestShellDelegate);	73 DISALLOW_COPY_AND_ASSIGN(TestShellDelegate);

74 };	74 };

75	75

76 } // namespace test	76 } // namespace test

77 } // namespace ash	77 } // namespace ash

78	78

79 #endif // ASH_TEST_TEST_SHELL_DELEGATE_H_	79 #endif // ASH_TEST_TEST_SHELL_DELEGATE_H_

OLD	NEW