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

Side by Side Diff: trunk/src/ash/shell/shell_delegate_impl.h

Issue 77203002: Revert 236048 "Rename RootWindowHost* to WindowTreeHost*" (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: 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 | « trunk/src/ash/shell.cc ('k') | trunk/src/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 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
50 virtual ash::UserWallpaperDelegate* CreateUserWallpaperDelegate() OVERRIDE; 50 virtual ash::UserWallpaperDelegate* CreateUserWallpaperDelegate() OVERRIDE;
51 virtual ash::CapsLockDelegate* CreateCapsLockDelegate() OVERRIDE; 51 virtual ash::CapsLockDelegate* CreateCapsLockDelegate() OVERRIDE;
52 virtual ash::SessionStateDelegate* CreateSessionStateDelegate() OVERRIDE; 52 virtual ash::SessionStateDelegate* CreateSessionStateDelegate() OVERRIDE;
53 virtual ash::AccessibilityDelegate* CreateAccessibilityDelegate() OVERRIDE; 53 virtual ash::AccessibilityDelegate* CreateAccessibilityDelegate() OVERRIDE;
54 virtual ash::NewWindowDelegate* CreateNewWindowDelegate() OVERRIDE; 54 virtual ash::NewWindowDelegate* CreateNewWindowDelegate() OVERRIDE;
55 virtual ash::MediaDelegate* CreateMediaDelegate() OVERRIDE; 55 virtual ash::MediaDelegate* CreateMediaDelegate() OVERRIDE;
56 virtual aura::client::UserActionClient* CreateUserActionClient() OVERRIDE; 56 virtual aura::client::UserActionClient* CreateUserActionClient() OVERRIDE;
57 virtual void RecordUserMetricsAction(UserMetricsAction action) OVERRIDE; 57 virtual void RecordUserMetricsAction(UserMetricsAction action) OVERRIDE;
58 virtual ui::MenuModel* CreateContextMenu( 58 virtual ui::MenuModel* CreateContextMenu(
59 aura::Window* root_window) OVERRIDE; 59 aura::Window* root_window) OVERRIDE;
60 virtual WindowTreeHostFactory* CreateWindowTreeHostFactory() OVERRIDE; 60 virtual RootWindowHostFactory* CreateRootWindowHostFactory() OVERRIDE;
61 virtual base::string16 GetProductName() const OVERRIDE; 61 virtual base::string16 GetProductName() const OVERRIDE;
62 62
63 private: 63 private:
64 // Used to update Launcher. Owned by main. 64 // Used to update Launcher. Owned by main.
65 WindowWatcher* watcher_; 65 WindowWatcher* watcher_;
66 66
67 LauncherDelegateImpl* launcher_delegate_; 67 LauncherDelegateImpl* launcher_delegate_;
68 content::BrowserContext* browser_context_; 68 content::BrowserContext* browser_context_;
69 69
70 DISALLOW_COPY_AND_ASSIGN(ShellDelegateImpl); 70 DISALLOW_COPY_AND_ASSIGN(ShellDelegateImpl);
71 }; 71 };
72 72
73 } // namespace shell 73 } // namespace shell
74 } // namespace ash 74 } // namespace ash
75 75
76 #endif // ASH_SHELL_SHELL_DELEGATE_IMPL_H_ 76 #endif // ASH_SHELL_SHELL_DELEGATE_IMPL_H_
OLDNEW
« no previous file with comments | « trunk/src/ash/shell.cc ('k') | trunk/src/ash/shell/shell_delegate_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698