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

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

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/shell/shell_delegate_impl.h ('k') | ash/shell/window_watcher_shelf_item_delegate.h » ('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 #include "ash/shell/shell_delegate_impl.h" 5 #include "ash/shell/shell_delegate_impl.h"
6 6
7 #include "ash/accessibility_delegate.h" 7 #include "ash/accessibility_delegate.h"
8 #include "ash/caps_lock_delegate_stub.h" 8 #include "ash/caps_lock_delegate_stub.h"
9 #include "ash/default_accessibility_delegate.h" 9 #include "ash/default_accessibility_delegate.h"
10 #include "ash/default_user_wallpaper_delegate.h" 10 #include "ash/default_user_wallpaper_delegate.h"
(...skipping 140 matching lines...) Expand 10 before | Expand all | Expand 10 after
151 } 151 }
152 152
153 ash::MediaDelegate* ShellDelegateImpl::CreateMediaDelegate() { 153 ash::MediaDelegate* ShellDelegateImpl::CreateMediaDelegate() {
154 return new MediaDelegateImpl; 154 return new MediaDelegateImpl;
155 } 155 }
156 156
157 aura::client::UserActionClient* ShellDelegateImpl::CreateUserActionClient() { 157 aura::client::UserActionClient* ShellDelegateImpl::CreateUserActionClient() {
158 return NULL; 158 return NULL;
159 } 159 }
160 160
161 ui::MenuModel* ShellDelegateImpl::CreateContextMenu(aura::Window* root) { 161 ui::MenuModel* ShellDelegateImpl::CreateContextMenu(
162 aura::Window* root,
163 ash::ShelfItemDelegate* item_delegate,
164 ash::LauncherItem* item) {
162 return new ContextMenu(root); 165 return new ContextMenu(root);
163 } 166 }
164 167
165 WindowTreeHostFactory* ShellDelegateImpl::CreateWindowTreeHostFactory() { 168 WindowTreeHostFactory* ShellDelegateImpl::CreateWindowTreeHostFactory() {
166 return WindowTreeHostFactory::Create(); 169 return WindowTreeHostFactory::Create();
167 } 170 }
168 171
169 base::string16 ShellDelegateImpl::GetProductName() const { 172 base::string16 ShellDelegateImpl::GetProductName() const {
170 return base::string16(); 173 return base::string16();
171 } 174 }
172 175
173 } // namespace shell 176 } // namespace shell
174 } // namespace ash 177 } // namespace ash
OLDNEW
« no previous file with comments | « ash/shell/shell_delegate_impl.h ('k') | ash/shell/window_watcher_shelf_item_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698