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

Side by Side Diff: chrome/browser/ui/ash/chrome_shell_delegate_chromeos.cc

Issue 115113006: Rename Launcher to Shelf. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: more fixes Created 7 years 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
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/ash/chrome_shell_delegate.h" 5 #include "chrome/browser/ui/ash/chrome_shell_delegate.h"
6 6
7 #include "ash/accessibility_delegate.h" 7 #include "ash/accessibility_delegate.h"
8 #include "ash/media_delegate.h" 8 #include "ash/media_delegate.h"
9 #include "ash/wm/mru_window_tracker.h" 9 #include "ash/wm/mru_window_tracker.h"
10 #include "ash/wm/window_util.h" 10 #include "ash/wm/window_util.h"
(...skipping 236 matching lines...) Expand 10 before | Expand all | Expand 10 after
247 247
248 void ChromeShellDelegate::Observe(int type, 248 void ChromeShellDelegate::Observe(int type,
249 const content::NotificationSource& source, 249 const content::NotificationSource& source,
250 const content::NotificationDetails& details) { 250 const content::NotificationDetails& details) {
251 switch (type) { 251 switch (type) {
252 case chrome::NOTIFICATION_LOGIN_USER_PROFILE_PREPARED: 252 case chrome::NOTIFICATION_LOGIN_USER_PROFILE_PREPARED:
253 ash::Shell::GetInstance()->OnLoginUserProfilePrepared(); 253 ash::Shell::GetInstance()->OnLoginUserProfilePrepared();
254 break; 254 break;
255 case chrome::NOTIFICATION_SESSION_STARTED: 255 case chrome::NOTIFICATION_SESSION_STARTED:
256 RestoreFocus(); 256 RestoreFocus();
257 ash::Shell::GetInstance()->ShowLauncher(); 257 ash::Shell::GetInstance()->ShowShelf();
258 break; 258 break;
259 default: 259 default:
260 NOTREACHED() << "Unexpected notification " << type; 260 NOTREACHED() << "Unexpected notification " << type;
261 } 261 }
262 } 262 }
263 263
264 void ChromeShellDelegate::PlatformInit() { 264 void ChromeShellDelegate::PlatformInit() {
265 registrar_.Add(this, 265 registrar_.Add(this,
266 chrome::NOTIFICATION_LOGIN_USER_PROFILE_PREPARED, 266 chrome::NOTIFICATION_LOGIN_USER_PROFILE_PREPARED,
267 content::NotificationService::AllSources()); 267 content::NotificationService::AllSources());
268 registrar_.Add(this, 268 registrar_.Add(this,
269 chrome::NOTIFICATION_SESSION_STARTED, 269 chrome::NOTIFICATION_SESSION_STARTED,
270 content::NotificationService::AllSources()); 270 content::NotificationService::AllSources());
271 } 271 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698