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

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

Issue 11829040: Fix the content_browsertests everywhere maybe. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix SimpleMessageBoxViews asan failure. Created 7 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
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/ash/chrome_shell_delegate.h" 5 #include "chrome/browser/ui/ash/chrome_shell_delegate.h"
6 6
7 #include "ash/host/root_window_host_factory.h" 7 #include "ash/host/root_window_host_factory.h"
8 #include "ash/launcher/launcher_types.h" 8 #include "ash/launcher/launcher_types.h"
9 #include "ash/magnifier/magnifier_constants.h" 9 #include "ash/magnifier/magnifier_constants.h"
10 #include "ash/system/tray/system_tray_delegate.h" 10 #include "ash/system/tray/system_tray_delegate.h"
11 #include "ash/wm/stacking_controller.h"
12 #include "ash/wm/window_util.h" 11 #include "ash/wm/window_util.h"
13 #include "base/bind.h" 12 #include "base/bind.h"
14 #include "base/command_line.h" 13 #include "base/command_line.h"
15 #include "chrome/browser/chromeos/accessibility/magnification_manager.h" 14 #include "chrome/browser/chromeos/accessibility/magnification_manager.h"
16 #include "chrome/browser/chromeos/login/screen_locker.h" 15 #include "chrome/browser/chromeos/login/screen_locker.h"
17 #include "chrome/browser/extensions/api/terminal/terminal_extension_helper.h" 16 #include "chrome/browser/extensions/api/terminal/terminal_extension_helper.h"
18 #include "chrome/browser/lifetime/application_lifetime.h" 17 #include "chrome/browser/lifetime/application_lifetime.h"
19 #include "chrome/browser/prefs/pref_service.h" 18 #include "chrome/browser/prefs/pref_service.h"
20 #include "chrome/browser/profiles/profile_manager.h" 19 #include "chrome/browser/profiles/profile_manager.h"
21 #include "chrome/browser/sessions/tab_restore_service.h" 20 #include "chrome/browser/sessions/tab_restore_service.h"
(...skipping 528 matching lines...) Expand 10 before | Expand all | Expand 10 after
550 } 549 }
551 #endif 550 #endif
552 return std::numeric_limits<double>::min(); 551 return std::numeric_limits<double>::min();
553 } 552 }
554 553
555 ui::MenuModel* ChromeShellDelegate::CreateContextMenu(aura::RootWindow* root) { 554 ui::MenuModel* ChromeShellDelegate::CreateContextMenu(aura::RootWindow* root) {
556 DCHECK(launcher_delegate_); 555 DCHECK(launcher_delegate_);
557 return new LauncherContextMenu(launcher_delegate_, root); 556 return new LauncherContextMenu(launcher_delegate_, root);
558 } 557 }
559 558
560 aura::client::StackingClient* ChromeShellDelegate::CreateStackingClient() {
561 return new ash::StackingController;
562 }
563
564 ash::RootWindowHostFactory* ChromeShellDelegate::CreateRootWindowHostFactory() { 559 ash::RootWindowHostFactory* ChromeShellDelegate::CreateRootWindowHostFactory() {
565 return ash::RootWindowHostFactory::Create(); 560 return ash::RootWindowHostFactory::Create();
566 } 561 }
567 562
568 void ChromeShellDelegate::Observe(int type, 563 void ChromeShellDelegate::Observe(int type,
569 const content::NotificationSource& source, 564 const content::NotificationSource& source,
570 const content::NotificationDetails& details) { 565 const content::NotificationDetails& details) {
571 #if defined(OS_CHROMEOS) 566 #if defined(OS_CHROMEOS)
572 switch (type) { 567 switch (type) {
573 case chrome::NOTIFICATION_LOGIN_USER_PROFILE_PREPARED: 568 case chrome::NOTIFICATION_LOGIN_USER_PROFILE_PREPARED:
574 ash::Shell::GetInstance()->CreateLauncher(); 569 ash::Shell::GetInstance()->CreateLauncher();
575 break; 570 break;
576 case chrome::NOTIFICATION_SESSION_STARTED: 571 case chrome::NOTIFICATION_SESSION_STARTED:
577 ash::Shell::GetInstance()->ShowLauncher(); 572 ash::Shell::GetInstance()->ShowLauncher();
578 break; 573 break;
579 default: 574 default:
580 NOTREACHED() << "Unexpected notification " << type; 575 NOTREACHED() << "Unexpected notification " << type;
581 } 576 }
582 #else 577 #else
583 // MSVC++ warns about switch statements without any cases. 578 // MSVC++ warns about switch statements without any cases.
584 NOTREACHED() << "Unexpected notification " << type; 579 NOTREACHED() << "Unexpected notification " << type;
585 #endif 580 #endif
586 } 581 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698