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

Side by Side Diff: chrome/browser/ui/ash/chrome_shell_delegate.h

Issue 107163005: [ash] Add TYPE_DIALOG and its item's LauncherContextMenu (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebased Created 6 years, 11 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
« no previous file with comments | « ash/test/test_shell_delegate.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"
11 #include "ash/shell_delegate.h" 11 #include "ash/shell_delegate.h"
12 #include "base/basictypes.h" 12 #include "base/basictypes.h"
13 #include "base/compiler_specific.h" 13 #include "base/compiler_specific.h"
14 #include "base/memory/scoped_ptr.h" 14 #include "base/memory/scoped_ptr.h"
15 #include "content/public/browser/notification_observer.h" 15 #include "content/public/browser/notification_observer.h"
16 #include "content/public/browser/notification_registrar.h" 16 #include "content/public/browser/notification_registrar.h"
17 17
18 class Browser; 18 class Browser;
19 19
20 namespace ash {
21 class ShelfItemDelegate;
22 }
23
20 namespace content { 24 namespace content {
21 class WebContents; 25 class WebContents;
22 } 26 }
23 27
24 namespace keyboard { 28 namespace keyboard {
25 class KeyboardControllerProxy; 29 class KeyboardControllerProxy;
26 } 30 }
27 31
28 class ChromeLauncherController; 32 class ChromeLauncherController;
29 33
(...skipping 20 matching lines...) Expand all
50 virtual ash::ShelfDelegate* CreateShelfDelegate( 54 virtual ash::ShelfDelegate* CreateShelfDelegate(
51 ash::ShelfModel* model) OVERRIDE; 55 ash::ShelfModel* model) OVERRIDE;
52 virtual ash::SystemTrayDelegate* CreateSystemTrayDelegate() OVERRIDE; 56 virtual ash::SystemTrayDelegate* CreateSystemTrayDelegate() OVERRIDE;
53 virtual ash::UserWallpaperDelegate* CreateUserWallpaperDelegate() OVERRIDE; 57 virtual ash::UserWallpaperDelegate* CreateUserWallpaperDelegate() OVERRIDE;
54 virtual ash::CapsLockDelegate* CreateCapsLockDelegate() OVERRIDE; 58 virtual ash::CapsLockDelegate* CreateCapsLockDelegate() OVERRIDE;
55 virtual ash::SessionStateDelegate* CreateSessionStateDelegate() OVERRIDE; 59 virtual ash::SessionStateDelegate* CreateSessionStateDelegate() OVERRIDE;
56 virtual ash::AccessibilityDelegate* CreateAccessibilityDelegate() OVERRIDE; 60 virtual ash::AccessibilityDelegate* CreateAccessibilityDelegate() OVERRIDE;
57 virtual ash::NewWindowDelegate* CreateNewWindowDelegate() OVERRIDE; 61 virtual ash::NewWindowDelegate* CreateNewWindowDelegate() OVERRIDE;
58 virtual ash::MediaDelegate* CreateMediaDelegate() OVERRIDE; 62 virtual ash::MediaDelegate* CreateMediaDelegate() OVERRIDE;
59 virtual aura::client::UserActionClient* CreateUserActionClient() OVERRIDE; 63 virtual aura::client::UserActionClient* CreateUserActionClient() OVERRIDE;
60 virtual ui::MenuModel* CreateContextMenu(aura::Window* root) OVERRIDE; 64 virtual ui::MenuModel* CreateContextMenu(
65 aura::Window* root,
66 ash::ShelfItemDelegate* item_delegate,
67 ash::LauncherItem* item) OVERRIDE;
61 virtual ash::WindowTreeHostFactory* CreateWindowTreeHostFactory() OVERRIDE; 68 virtual ash::WindowTreeHostFactory* CreateWindowTreeHostFactory() OVERRIDE;
62 virtual base::string16 GetProductName() const OVERRIDE; 69 virtual base::string16 GetProductName() const OVERRIDE;
63 70
64 // content::NotificationObserver override: 71 // content::NotificationObserver override:
65 virtual void Observe(int type, 72 virtual void Observe(int type,
66 const content::NotificationSource& source, 73 const content::NotificationSource& source,
67 const content::NotificationDetails& details) OVERRIDE; 74 const content::NotificationDetails& details) OVERRIDE;
68 75
69 private: 76 private:
70 void PlatformInit(); 77 void PlatformInit();
71 78
72 static ChromeShellDelegate* instance_; 79 static ChromeShellDelegate* instance_;
73 80
74 content::NotificationRegistrar registrar_; 81 content::NotificationRegistrar registrar_;
75 82
76 ChromeLauncherController* shelf_delegate_; 83 ChromeLauncherController* shelf_delegate_;
77 84
78 DISALLOW_COPY_AND_ASSIGN(ChromeShellDelegate); 85 DISALLOW_COPY_AND_ASSIGN(ChromeShellDelegate);
79 }; 86 };
80 87
81 #endif // CHROME_BROWSER_UI_ASH_CHROME_SHELL_DELEGATE_H_ 88 #endif // CHROME_BROWSER_UI_ASH_CHROME_SHELL_DELEGATE_H_
OLDNEW
« no previous file with comments | « ash/test/test_shell_delegate.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