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

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: 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 | « chrome/browser/ui/ash/ash_init.cc ('k') | chrome/browser/ui/ash/chrome_shell_delegate.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 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 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
54 virtual ash::UserWallpaperDelegate* CreateUserWallpaperDelegate() OVERRIDE; 54 virtual ash::UserWallpaperDelegate* CreateUserWallpaperDelegate() OVERRIDE;
55 virtual ash::CapsLockDelegate* CreateCapsLockDelegate() OVERRIDE; 55 virtual ash::CapsLockDelegate* CreateCapsLockDelegate() OVERRIDE;
56 virtual ash::SessionStateDelegate* CreateSessionStateDelegate() OVERRIDE; 56 virtual ash::SessionStateDelegate* CreateSessionStateDelegate() OVERRIDE;
57 virtual ash::AccessibilityDelegate* CreateAccessibilityDelegate() OVERRIDE; 57 virtual ash::AccessibilityDelegate* CreateAccessibilityDelegate() OVERRIDE;
58 virtual ash::NewWindowDelegate* CreateNewWindowDelegate() OVERRIDE; 58 virtual ash::NewWindowDelegate* CreateNewWindowDelegate() OVERRIDE;
59 virtual aura::client::UserActionClient* CreateUserActionClient() OVERRIDE; 59 virtual aura::client::UserActionClient* CreateUserActionClient() OVERRIDE;
60 virtual void RecordUserMetricsAction(ash::UserMetricsAction action) OVERRIDE; 60 virtual void RecordUserMetricsAction(ash::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 ash::RootWindowHostFactory* CreateRootWindowHostFactory() OVERRIDE; 65 virtual ash::RootWindowHostFactory* CreateRootWindowHostFactory() OVERRIDE;
66 virtual string16 GetProductName() const OVERRIDE; 66 virtual string16 GetProductName() const OVERRIDE;
67 67
68 // content::NotificationObserver override: 68 // content::NotificationObserver override:
69 virtual void Observe(int type, 69 virtual void Observe(int type,
70 const content::NotificationSource& source, 70 const content::NotificationSource& source,
71 const content::NotificationDetails& details) OVERRIDE; 71 const content::NotificationDetails& details) OVERRIDE;
72 72
73 private: 73 private:
74 void PlatformInit(); 74 void PlatformInit();
75 75
76 static ChromeShellDelegate* instance_; 76 static ChromeShellDelegate* instance_;
77 77
78 content::NotificationRegistrar registrar_; 78 content::NotificationRegistrar registrar_;
79 79
80 ChromeLauncherController* launcher_delegate_; 80 ChromeLauncherController* launcher_delegate_;
81 81
82 DISALLOW_COPY_AND_ASSIGN(ChromeShellDelegate); 82 DISALLOW_COPY_AND_ASSIGN(ChromeShellDelegate);
83 }; 83 };
84 84
85 #endif // CHROME_BROWSER_UI_ASH_CHROME_SHELL_DELEGATE_H_ 85 #endif // CHROME_BROWSER_UI_ASH_CHROME_SHELL_DELEGATE_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/ash/ash_init.cc ('k') | chrome/browser/ui/ash/chrome_shell_delegate.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698