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

Side by Side Diff: chrome/browser/ui/ash/chrome_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, 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 CHROME_BROWSER_UI_ASH_CHROME_SHELL_DELEGATE_H_ 5 #ifndef CHROME_BROWSER_UI_ASH_CHROME_SHELL_DELEGATE_H_
6 #define CHROME_BROWSER_UI_ASH_CHROME_SHELL_DELEGATE_H_ 6 #define CHROME_BROWSER_UI_ASH_CHROME_SHELL_DELEGATE_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "ash/launcher/launcher_types.h" 10 #include "ash/launcher/launcher_types.h"
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
60 virtual ash::UserWallpaperDelegate* CreateUserWallpaperDelegate() OVERRIDE; 60 virtual ash::UserWallpaperDelegate* CreateUserWallpaperDelegate() OVERRIDE;
61 virtual ash::CapsLockDelegate* CreateCapsLockDelegate() OVERRIDE; 61 virtual ash::CapsLockDelegate* CreateCapsLockDelegate() OVERRIDE;
62 virtual ash::SessionStateDelegate* CreateSessionStateDelegate() OVERRIDE; 62 virtual ash::SessionStateDelegate* CreateSessionStateDelegate() OVERRIDE;
63 virtual ash::AccessibilityDelegate* CreateAccessibilityDelegate() OVERRIDE; 63 virtual ash::AccessibilityDelegate* CreateAccessibilityDelegate() OVERRIDE;
64 virtual aura::client::UserActionClient* CreateUserActionClient() OVERRIDE; 64 virtual aura::client::UserActionClient* CreateUserActionClient() OVERRIDE;
65 virtual void OpenFeedbackPage() OVERRIDE; 65 virtual void OpenFeedbackPage() OVERRIDE;
66 virtual void RecordUserMetricsAction(ash::UserMetricsAction action) OVERRIDE; 66 virtual void RecordUserMetricsAction(ash::UserMetricsAction action) OVERRIDE;
67 virtual void HandleMediaNextTrack() OVERRIDE; 67 virtual void HandleMediaNextTrack() OVERRIDE;
68 virtual void HandleMediaPlayPause() OVERRIDE; 68 virtual void HandleMediaPlayPause() OVERRIDE;
69 virtual void HandleMediaPrevTrack() OVERRIDE; 69 virtual void HandleMediaPrevTrack() OVERRIDE;
70 virtual ui::MenuModel* CreateContextMenu(aura::RootWindow* root) OVERRIDE; 70 virtual ui::MenuModel* CreateContextMenu(aura::Window* root) OVERRIDE;
71 virtual ash::RootWindowHostFactory* CreateRootWindowHostFactory() OVERRIDE; 71 virtual ash::RootWindowHostFactory* CreateRootWindowHostFactory() OVERRIDE;
72 virtual string16 GetProductName() const OVERRIDE; 72 virtual string16 GetProductName() const OVERRIDE;
73 73
74 // content::NotificationObserver override: 74 // content::NotificationObserver override:
75 virtual void Observe(int type, 75 virtual void Observe(int type,
76 const content::NotificationSource& source, 76 const content::NotificationSource& source,
77 const content::NotificationDetails& details) OVERRIDE; 77 const content::NotificationDetails& details) OVERRIDE;
78 78
79 private: 79 private:
80 class TabRestoreHelper; 80 class TabRestoreHelper;
(...skipping 14 matching lines...) Expand all
95 content::NotificationRegistrar registrar_; 95 content::NotificationRegistrar registrar_;
96 96
97 ChromeLauncherController* launcher_delegate_; 97 ChromeLauncherController* launcher_delegate_;
98 98
99 scoped_ptr<TabRestoreHelper> tab_restore_helper_; 99 scoped_ptr<TabRestoreHelper> tab_restore_helper_;
100 100
101 DISALLOW_COPY_AND_ASSIGN(ChromeShellDelegate); 101 DISALLOW_COPY_AND_ASSIGN(ChromeShellDelegate);
102 }; 102 };
103 103
104 #endif // CHROME_BROWSER_UI_ASH_CHROME_SHELL_DELEGATE_H_ 104 #endif // CHROME_BROWSER_UI_ASH_CHROME_SHELL_DELEGATE_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698