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

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: 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/shell/context_menu.cc ('k') | ash/shell/shell_delegate_impl.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
45 virtual ash::CapsLockDelegate* CreateCapsLockDelegate() OVERRIDE; 45 virtual ash::CapsLockDelegate* CreateCapsLockDelegate() OVERRIDE;
46 virtual ash::SessionStateDelegate* CreateSessionStateDelegate() OVERRIDE; 46 virtual ash::SessionStateDelegate* CreateSessionStateDelegate() OVERRIDE;
47 virtual ash::AccessibilityDelegate* CreateAccessibilityDelegate() OVERRIDE; 47 virtual ash::AccessibilityDelegate* CreateAccessibilityDelegate() OVERRIDE;
48 virtual ash::NewWindowDelegate* CreateNewWindowDelegate() OVERRIDE; 48 virtual ash::NewWindowDelegate* CreateNewWindowDelegate() OVERRIDE;
49 virtual aura::client::UserActionClient* CreateUserActionClient() OVERRIDE; 49 virtual aura::client::UserActionClient* CreateUserActionClient() OVERRIDE;
50 virtual void RecordUserMetricsAction(UserMetricsAction action) OVERRIDE; 50 virtual void RecordUserMetricsAction(UserMetricsAction action) OVERRIDE;
51 virtual void HandleMediaNextTrack() OVERRIDE; 51 virtual void HandleMediaNextTrack() OVERRIDE;
52 virtual void HandleMediaPlayPause() OVERRIDE; 52 virtual void HandleMediaPlayPause() OVERRIDE;
53 virtual void HandleMediaPrevTrack() OVERRIDE; 53 virtual void HandleMediaPrevTrack() OVERRIDE;
54 virtual ui::MenuModel* CreateContextMenu( 54 virtual ui::MenuModel* CreateContextMenu(
55 aura::RootWindow* root_window) OVERRIDE; 55 aura::Window* root_window) OVERRIDE;
56 virtual RootWindowHostFactory* CreateRootWindowHostFactory() OVERRIDE; 56 virtual RootWindowHostFactory* CreateRootWindowHostFactory() OVERRIDE;
57 virtual base::string16 GetProductName() const OVERRIDE; 57 virtual base::string16 GetProductName() const OVERRIDE;
58 58
59 private: 59 private:
60 // Used to update Launcher. Owned by main. 60 // Used to update Launcher. Owned by main.
61 WindowWatcher* watcher_; 61 WindowWatcher* watcher_;
62 62
63 LauncherDelegateImpl* launcher_delegate_; 63 LauncherDelegateImpl* launcher_delegate_;
64 64
65 DISALLOW_COPY_AND_ASSIGN(ShellDelegateImpl); 65 DISALLOW_COPY_AND_ASSIGN(ShellDelegateImpl);
66 }; 66 };
67 67
68 } // namespace shell 68 } // namespace shell
69 } // namespace ash 69 } // namespace ash
70 70
71 #endif // ASH_SHELL_SHELL_DELEGATE_IMPL_H_ 71 #endif // ASH_SHELL_SHELL_DELEGATE_IMPL_H_
OLDNEW
« no previous file with comments | « ash/shell/context_menu.cc ('k') | ash/shell/shell_delegate_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698