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

Side by Side Diff: ash/shell/shell_delegate_impl.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, 2 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
OLDNEW
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 7
8 #include <string> 8 #include <string>
9 9
10 #include "ash/shell_delegate.h" 10 #include "ash/shell_delegate.h"
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
52 virtual ash::CapsLockDelegate* CreateCapsLockDelegate() OVERRIDE; 52 virtual ash::CapsLockDelegate* CreateCapsLockDelegate() OVERRIDE;
53 virtual ash::SessionStateDelegate* CreateSessionStateDelegate() OVERRIDE; 53 virtual ash::SessionStateDelegate* CreateSessionStateDelegate() OVERRIDE;
54 virtual ash::AccessibilityDelegate* CreateAccessibilityDelegate() OVERRIDE; 54 virtual ash::AccessibilityDelegate* CreateAccessibilityDelegate() OVERRIDE;
55 virtual aura::client::UserActionClient* CreateUserActionClient() OVERRIDE; 55 virtual aura::client::UserActionClient* CreateUserActionClient() OVERRIDE;
56 virtual void OpenFeedbackPage() OVERRIDE; 56 virtual void OpenFeedbackPage() OVERRIDE;
57 virtual void RecordUserMetricsAction(UserMetricsAction action) OVERRIDE; 57 virtual void RecordUserMetricsAction(UserMetricsAction action) OVERRIDE;
58 virtual void HandleMediaNextTrack() OVERRIDE; 58 virtual void HandleMediaNextTrack() OVERRIDE;
59 virtual void HandleMediaPlayPause() OVERRIDE; 59 virtual void HandleMediaPlayPause() OVERRIDE;
60 virtual void HandleMediaPrevTrack() OVERRIDE; 60 virtual void HandleMediaPrevTrack() OVERRIDE;
61 virtual ui::MenuModel* CreateContextMenu( 61 virtual ui::MenuModel* CreateContextMenu(
62 aura::RootWindow* root_window) OVERRIDE; 62 aura::Window* root_window) OVERRIDE;
63 virtual RootWindowHostFactory* CreateRootWindowHostFactory() OVERRIDE; 63 virtual RootWindowHostFactory* CreateRootWindowHostFactory() OVERRIDE;
64 virtual base::string16 GetProductName() const OVERRIDE; 64 virtual base::string16 GetProductName() const OVERRIDE;
65 65
66 private: 66 private:
67 // Used to update Launcher. Owned by main. 67 // Used to update Launcher. Owned by main.
68 WindowWatcher* watcher_; 68 WindowWatcher* watcher_;
69 69
70 LauncherDelegateImpl* launcher_delegate_; 70 LauncherDelegateImpl* launcher_delegate_;
71 71
72 DISALLOW_COPY_AND_ASSIGN(ShellDelegateImpl); 72 DISALLOW_COPY_AND_ASSIGN(ShellDelegateImpl);
73 }; 73 };
74 74
75 } // namespace shell 75 } // namespace shell
76 } // namespace ash 76 } // namespace ash
77 77
78 #endif // ASH_SHELL_SHELL_DELEGATE_IMPL_H_ 78 #endif // ASH_SHELL_SHELL_DELEGATE_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698