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

Side by Side Diff: chrome/browser/ui/views/ash/chrome_shell_delegate.cc

Issue 10388032: Move app list from ash to ui. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: fix win_aura bot and comments in #5 Created 8 years, 7 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 | « chrome/browser/ui/views/ash/chrome_shell_delegate.h ('k') | chrome/chrome_browser.gypi » ('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 "chrome/browser/ui/views/ash/chrome_shell_delegate.h" 5 #include "chrome/browser/ui/views/ash/chrome_shell_delegate.h"
6 6
7 #include "ash/launcher/launcher_types.h" 7 #include "ash/launcher/launcher_types.h"
8 #include "ash/system/tray/system_tray_delegate.h" 8 #include "ash/system/tray/system_tray_delegate.h"
9 #include "ash/wm/partial_screenshot_view.h" 9 #include "ash/wm/partial_screenshot_view.h"
10 #include "ash/wm/window_util.h" 10 #include "ash/wm/window_util.h"
(...skipping 189 matching lines...) Expand 10 before | Expand all | Expand 10 after
200 content::WebUI* login_screen_web_ui = NULL; 200 content::WebUI* login_screen_web_ui = NULL;
201 chromeos::WebUILoginDisplayHost* host = 201 chromeos::WebUILoginDisplayHost* host =
202 static_cast<chromeos::WebUILoginDisplayHost*>( 202 static_cast<chromeos::WebUILoginDisplayHost*>(
203 chromeos::BaseLoginDisplayHost::default_host()); 203 chromeos::BaseLoginDisplayHost::default_host());
204 if (host && host->GetOobeUI()) 204 if (host && host->GetOobeUI())
205 login_screen_web_ui = host->GetOobeUI()->web_ui(); 205 login_screen_web_ui = host->GetOobeUI()->web_ui();
206 chromeos::accessibility::ToggleSpokenFeedback(login_screen_web_ui); 206 chromeos::accessibility::ToggleSpokenFeedback(login_screen_web_ui);
207 #endif 207 #endif
208 } 208 }
209 209
210 ash::AppListViewDelegate* 210 app_list::AppListViewDelegate*
211 ChromeShellDelegate::CreateAppListViewDelegate() { 211 ChromeShellDelegate::CreateAppListViewDelegate() {
212 // Shell will own the created delegate. 212 // Shell will own the created delegate.
213 return new AppListViewDelegate; 213 return new AppListViewDelegate;
214 } 214 }
215 215
216 void ChromeShellDelegate::StartPartialScreenshot( 216 void ChromeShellDelegate::StartPartialScreenshot(
217 ash::ScreenshotDelegate* screenshot_delegate) { 217 ash::ScreenshotDelegate* screenshot_delegate) {
218 ash::PartialScreenshotView::StartPartialScreenshot(screenshot_delegate); 218 ash::PartialScreenshotView::StartPartialScreenshot(screenshot_delegate);
219 } 219 }
220 220
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
252 ash::Shell::GetInstance()->CreateLauncher(); 252 ash::Shell::GetInstance()->CreateLauncher();
253 break; 253 break;
254 default: 254 default:
255 NOTREACHED() << "Unexpected notification " << type; 255 NOTREACHED() << "Unexpected notification " << type;
256 } 256 }
257 #else 257 #else
258 // MSVC++ warns about switch statements without any cases. 258 // MSVC++ warns about switch statements without any cases.
259 NOTREACHED() << "Unexpected notification " << type; 259 NOTREACHED() << "Unexpected notification " << type;
260 #endif 260 #endif
261 } 261 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/ash/chrome_shell_delegate.h ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698