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

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

Issue 2434463004: mash: Move directly linked NewWindowDelegate to mojom::NewWindowClient. (Closed)
Patch Set: Actually rename the browser test. Created 4 years, 2 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
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 <stddef.h> 7 #include <stddef.h>
8 8
9 #include <limits> 9 #include <limits>
10 10
(...skipping 28 matching lines...) Expand all
39 #include "chrome/browser/lifetime/application_lifetime.h" 39 #include "chrome/browser/lifetime/application_lifetime.h"
40 #include "chrome/browser/profiles/profile.h" 40 #include "chrome/browser/profiles/profile.h"
41 #include "chrome/browser/profiles/profile_manager.h" 41 #include "chrome/browser/profiles/profile_manager.h"
42 #include "chrome/browser/profiles/profiles_state.h" 42 #include "chrome/browser/profiles/profiles_state.h"
43 #include "chrome/browser/signin/signin_error_notifier_factory_ash.h" 43 #include "chrome/browser/signin/signin_error_notifier_factory_ash.h"
44 #include "chrome/browser/speech/tts_controller.h" 44 #include "chrome/browser/speech/tts_controller.h"
45 #include "chrome/browser/sync/sync_error_notifier_factory_ash.h" 45 #include "chrome/browser/sync/sync_error_notifier_factory_ash.h"
46 #include "chrome/browser/ui/app_list/app_list_view_delegate.h" 46 #include "chrome/browser/ui/app_list/app_list_view_delegate.h"
47 #include "chrome/browser/ui/ash/app_list/app_list_service_ash.h" 47 #include "chrome/browser/ui/ash/app_list/app_list_service_ash.h"
48 #include "chrome/browser/ui/ash/chrome_keyboard_ui.h" 48 #include "chrome/browser/ui/ash/chrome_keyboard_ui.h"
49 #include "chrome/browser/ui/ash/chrome_new_window_delegate.h"
50 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl.h" 49 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl.h"
51 #include "chrome/browser/ui/ash/launcher/launcher_context_menu.h" 50 #include "chrome/browser/ui/ash/launcher/launcher_context_menu.h"
52 #include "chrome/browser/ui/ash/media_delegate_chromeos.h" 51 #include "chrome/browser/ui/ash/media_delegate_chromeos.h"
53 #include "chrome/browser/ui/ash/multi_user/multi_user_util.h" 52 #include "chrome/browser/ui/ash/multi_user/multi_user_util.h"
54 #include "chrome/browser/ui/ash/palette_delegate_chromeos.h" 53 #include "chrome/browser/ui/ash/palette_delegate_chromeos.h"
55 #include "chrome/browser/ui/ash/session_state_delegate_chromeos.h" 54 #include "chrome/browser/ui/ash/session_state_delegate_chromeos.h"
56 #include "chrome/browser/ui/ash/session_util.h" 55 #include "chrome/browser/ui/ash/session_util.h"
57 #include "chrome/browser/ui/ash/system_tray_delegate_chromeos.h" 56 #include "chrome/browser/ui/ash/system_tray_delegate_chromeos.h"
58 #include "chrome/browser/ui/aura/accessibility/automation_manager_aura.h" 57 #include "chrome/browser/ui/aura/accessibility/automation_manager_aura.h"
59 #include "chrome/browser/ui/browser.h" 58 #include "chrome/browser/ui/browser.h"
(...skipping 435 matching lines...) Expand 10 before | Expand all | Expand 10 after
495 } 494 }
496 495
497 ash::SessionStateDelegate* ChromeShellDelegate::CreateSessionStateDelegate() { 496 ash::SessionStateDelegate* ChromeShellDelegate::CreateSessionStateDelegate() {
498 return new SessionStateDelegateChromeos; 497 return new SessionStateDelegateChromeos;
499 } 498 }
500 499
501 ash::AccessibilityDelegate* ChromeShellDelegate::CreateAccessibilityDelegate() { 500 ash::AccessibilityDelegate* ChromeShellDelegate::CreateAccessibilityDelegate() {
502 return new AccessibilityDelegateImpl; 501 return new AccessibilityDelegateImpl;
503 } 502 }
504 503
505 ash::NewWindowDelegate* ChromeShellDelegate::CreateNewWindowDelegate() {
506 return new ChromeNewWindowDelegate;
507 }
508
509 ash::MediaDelegate* ChromeShellDelegate::CreateMediaDelegate() { 504 ash::MediaDelegate* ChromeShellDelegate::CreateMediaDelegate() {
510 return new MediaDelegateChromeOS; 505 return new MediaDelegateChromeOS;
511 } 506 }
512 507
513 std::unique_ptr<ash::PaletteDelegate> 508 std::unique_ptr<ash::PaletteDelegate>
514 ChromeShellDelegate::CreatePaletteDelegate() { 509 ChromeShellDelegate::CreatePaletteDelegate() {
515 return chromeos::PaletteDelegateChromeOS::Create(); 510 return chromeos::PaletteDelegateChromeOS::Create();
516 } 511 }
517 512
518 ash::SystemTrayDelegate* ChromeShellDelegate::CreateSystemTrayDelegate() { 513 ash::SystemTrayDelegate* ChromeShellDelegate::CreateSystemTrayDelegate() {
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
555 NOTREACHED() << "Unexpected notification " << type; 550 NOTREACHED() << "Unexpected notification " << type;
556 } 551 }
557 } 552 }
558 553
559 void ChromeShellDelegate::PlatformInit() { 554 void ChromeShellDelegate::PlatformInit() {
560 registrar_.Add(this, chrome::NOTIFICATION_LOGIN_USER_PROFILE_PREPARED, 555 registrar_.Add(this, chrome::NOTIFICATION_LOGIN_USER_PROFILE_PREPARED,
561 content::NotificationService::AllSources()); 556 content::NotificationService::AllSources());
562 registrar_.Add(this, chrome::NOTIFICATION_SESSION_STARTED, 557 registrar_.Add(this, chrome::NOTIFICATION_SESSION_STARTED,
563 content::NotificationService::AllSources()); 558 content::NotificationService::AllSources());
564 } 559 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698