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

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

Issue 183853037: aura: Remove client::UserActionClient. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: unrevert Created 6 years, 9 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/shell.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 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
46 virtual content::BrowserContext* GetActiveBrowserContext() OVERRIDE; 46 virtual content::BrowserContext* GetActiveBrowserContext() OVERRIDE;
47 virtual app_list::AppListViewDelegate* CreateAppListViewDelegate() OVERRIDE; 47 virtual app_list::AppListViewDelegate* CreateAppListViewDelegate() OVERRIDE;
48 virtual ShelfDelegate* CreateShelfDelegate(ShelfModel* model) OVERRIDE; 48 virtual ShelfDelegate* CreateShelfDelegate(ShelfModel* model) OVERRIDE;
49 virtual ash::SystemTrayDelegate* CreateSystemTrayDelegate() OVERRIDE; 49 virtual ash::SystemTrayDelegate* CreateSystemTrayDelegate() OVERRIDE;
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;
57 virtual ui::MenuModel* CreateContextMenu( 56 virtual ui::MenuModel* CreateContextMenu(
58 aura::Window* root_window, 57 aura::Window* root_window,
59 ash::ShelfItemDelegate* item_delegate, 58 ash::ShelfItemDelegate* item_delegate,
60 ash::ShelfItem* item) OVERRIDE; 59 ash::ShelfItem* item) OVERRIDE;
61 virtual WindowTreeHostFactory* CreateWindowTreeHostFactory() OVERRIDE; 60 virtual WindowTreeHostFactory* CreateWindowTreeHostFactory() OVERRIDE;
62 virtual GPUSupport* CreateGPUSupport() OVERRIDE; 61 virtual GPUSupport* CreateGPUSupport() OVERRIDE;
63 virtual base::string16 GetProductName() const OVERRIDE; 62 virtual base::string16 GetProductName() const OVERRIDE;
64 63
65 private: 64 private:
66 // Used to update Launcher. Owned by main. 65 // Used to update Launcher. Owned by main.
67 WindowWatcher* watcher_; 66 WindowWatcher* watcher_;
68 67
69 ShelfDelegateImpl* shelf_delegate_; 68 ShelfDelegateImpl* shelf_delegate_;
70 content::BrowserContext* browser_context_; 69 content::BrowserContext* browser_context_;
71 70
72 DISALLOW_COPY_AND_ASSIGN(ShellDelegateImpl); 71 DISALLOW_COPY_AND_ASSIGN(ShellDelegateImpl);
73 }; 72 };
74 73
75 } // namespace shell 74 } // namespace shell
76 } // namespace ash 75 } // namespace ash
77 76
78 #endif // ASH_SHELL_SHELL_DELEGATE_IMPL_H_ 77 #endif // ASH_SHELL_SHELL_DELEGATE_IMPL_H_
OLDNEW
« no previous file with comments | « ash/shell.cc ('k') | ash/shell/shell_delegate_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698