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

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

Issue 71653003: ash: Rename LauncherModel to ShelfModel. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: chrome changes 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 | « ash/shell/shell_delegate_impl.h ('k') | ash/shell/window_watcher.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 103 matching lines...) Expand 10 before | Expand all | Expand 10 after
114 } 114 }
115 115
116 content::BrowserContext* ShellDelegateImpl::GetCurrentBrowserContext() { 116 content::BrowserContext* ShellDelegateImpl::GetCurrentBrowserContext() {
117 return browser_context_; 117 return browser_context_;
118 } 118 }
119 119
120 app_list::AppListViewDelegate* ShellDelegateImpl::CreateAppListViewDelegate() { 120 app_list::AppListViewDelegate* ShellDelegateImpl::CreateAppListViewDelegate() {
121 return ash::shell::CreateAppListViewDelegate(); 121 return ash::shell::CreateAppListViewDelegate();
122 } 122 }
123 123
124 ash::LauncherDelegate* ShellDelegateImpl::CreateLauncherDelegate( 124 LauncherDelegate* ShellDelegateImpl::CreateLauncherDelegate(ShelfModel* model) {
125 ash::LauncherModel* model) {
126 launcher_delegate_ = new LauncherDelegateImpl(watcher_); 125 launcher_delegate_ = new LauncherDelegateImpl(watcher_);
127 return launcher_delegate_; 126 return launcher_delegate_;
128 } 127 }
129 128
130 ash::SystemTrayDelegate* ShellDelegateImpl::CreateSystemTrayDelegate() { 129 ash::SystemTrayDelegate* ShellDelegateImpl::CreateSystemTrayDelegate() {
131 return new DefaultSystemTrayDelegate; 130 return new DefaultSystemTrayDelegate;
132 } 131 }
133 132
134 ash::UserWallpaperDelegate* ShellDelegateImpl::CreateUserWallpaperDelegate() { 133 ash::UserWallpaperDelegate* ShellDelegateImpl::CreateUserWallpaperDelegate() {
135 return new DefaultUserWallpaperDelegate(); 134 return new DefaultUserWallpaperDelegate();
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
169 RootWindowHostFactory* ShellDelegateImpl::CreateRootWindowHostFactory() { 168 RootWindowHostFactory* ShellDelegateImpl::CreateRootWindowHostFactory() {
170 return RootWindowHostFactory::Create(); 169 return RootWindowHostFactory::Create();
171 } 170 }
172 171
173 base::string16 ShellDelegateImpl::GetProductName() const { 172 base::string16 ShellDelegateImpl::GetProductName() const {
174 return base::string16(); 173 return base::string16();
175 } 174 }
176 175
177 } // namespace shell 176 } // namespace shell
178 } // namespace ash 177 } // namespace ash
OLDNEW
« no previous file with comments | « ash/shell/shell_delegate_impl.h ('k') | ash/shell/window_watcher.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698