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: First cut for review/trybots 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') | ui/aura/root_window.cc » ('J')

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 43 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
54 virtual UserWallpaperDelegate* CreateUserWallpaperDelegate() OVERRIDE;	54 virtual UserWallpaperDelegate* CreateUserWallpaperDelegate() OVERRIDE;

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

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

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

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

59 virtual void OpenFeedbackPage() OVERRIDE;	59 virtual void OpenFeedbackPage() OVERRIDE;

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

61 virtual void HandleMediaNextTrack() OVERRIDE;	61 virtual void HandleMediaNextTrack() OVERRIDE;

62 virtual void HandleMediaPlayPause() OVERRIDE;	62 virtual void HandleMediaPlayPause() OVERRIDE;

63 virtual void HandleMediaPrevTrack() OVERRIDE;	63 virtual void HandleMediaPrevTrack() OVERRIDE;

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

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

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

67	67

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

69	69

70 TestSessionStateDelegate* test_session_state_delegate();	70 TestSessionStateDelegate* test_session_state_delegate();

71	71

72 private:	72 private:

73 int num_exit_requests_;	73 int num_exit_requests_;

74 bool multi_profiles_enabled_;	74 bool multi_profiles_enabled_;

75	75

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

77	77

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

79	79

80 DISALLOW_COPY_AND_ASSIGN(TestShellDelegate);	80 DISALLOW_COPY_AND_ASSIGN(TestShellDelegate);

81 };	81 };

82	82

83 } // namespace test	83 } // namespace test

84 } // namespace ash	84 } // namespace ash

85	85

86 #endif // ASH_TEST_TEST_SHELL_DELEGATE_H_	86 #endif // ASH_TEST_TEST_SHELL_DELEGATE_H_

OLD	NEW