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

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

Issue 2199993002: Add generic PaletteDelegate code. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@note-options
Patch Set: Nits Created 4 years, 4 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 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
43 #include "chrome/browser/speech/tts_controller.h" 43 #include "chrome/browser/speech/tts_controller.h"
44 #include "chrome/browser/sync/sync_error_notifier_factory_ash.h" 44 #include "chrome/browser/sync/sync_error_notifier_factory_ash.h"
45 #include "chrome/browser/ui/app_list/app_list_view_delegate.h" 45 #include "chrome/browser/ui/app_list/app_list_view_delegate.h"
46 #include "chrome/browser/ui/ash/app_list/app_list_service_ash.h" 46 #include "chrome/browser/ui/ash/app_list/app_list_service_ash.h"
47 #include "chrome/browser/ui/ash/chrome_keyboard_ui.h" 47 #include "chrome/browser/ui/ash/chrome_keyboard_ui.h"
48 #include "chrome/browser/ui/ash/chrome_new_window_delegate.h" 48 #include "chrome/browser/ui/ash/chrome_new_window_delegate.h"
49 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl.h" 49 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl.h"
50 #include "chrome/browser/ui/ash/launcher/launcher_context_menu.h" 50 #include "chrome/browser/ui/ash/launcher/launcher_context_menu.h"
51 #include "chrome/browser/ui/ash/media_delegate_chromeos.h" 51 #include "chrome/browser/ui/ash/media_delegate_chromeos.h"
52 #include "chrome/browser/ui/ash/multi_user/multi_user_util.h" 52 #include "chrome/browser/ui/ash/multi_user/multi_user_util.h"
53 #include "chrome/browser/ui/ash/palette_delegate_chromeos.h"
53 #include "chrome/browser/ui/ash/session_state_delegate_chromeos.h" 54 #include "chrome/browser/ui/ash/session_state_delegate_chromeos.h"
54 #include "chrome/browser/ui/ash/session_util.h" 55 #include "chrome/browser/ui/ash/session_util.h"
55 #include "chrome/browser/ui/ash/system_tray_delegate_chromeos.h" 56 #include "chrome/browser/ui/ash/system_tray_delegate_chromeos.h"
56 #include "chrome/browser/ui/aura/accessibility/automation_manager_aura.h" 57 #include "chrome/browser/ui/aura/accessibility/automation_manager_aura.h"
57 #include "chrome/browser/ui/browser.h" 58 #include "chrome/browser/ui/browser.h"
58 #include "chrome/browser/ui/browser_commands.h" 59 #include "chrome/browser/ui/browser_commands.h"
59 #include "chrome/browser/ui/browser_finder.h" 60 #include "chrome/browser/ui/browser_finder.h"
60 #include "chrome/browser/ui/browser_navigator.h" 61 #include "chrome/browser/ui/browser_navigator.h"
61 #include "chrome/browser/ui/browser_navigator_params.h" 62 #include "chrome/browser/ui/browser_navigator_params.h"
62 #include "chrome/browser/ui/browser_tabstrip.h" 63 #include "chrome/browser/ui/browser_tabstrip.h"
(...skipping 437 matching lines...) Expand 10 before | Expand all | Expand 10 after
500 } 501 }
501 502
502 ash::NewWindowDelegate* ChromeShellDelegate::CreateNewWindowDelegate() { 503 ash::NewWindowDelegate* ChromeShellDelegate::CreateNewWindowDelegate() {
503 return new ChromeNewWindowDelegate; 504 return new ChromeNewWindowDelegate;
504 } 505 }
505 506
506 ash::MediaDelegate* ChromeShellDelegate::CreateMediaDelegate() { 507 ash::MediaDelegate* ChromeShellDelegate::CreateMediaDelegate() {
507 return new MediaDelegateChromeOS; 508 return new MediaDelegateChromeOS;
508 } 509 }
509 510
511 std::unique_ptr<ash::PaletteDelegate>
512 ChromeShellDelegate::CreatePaletteDelegate() {
513 return base::WrapUnique(new chromeos::PaletteDelegateChromeOS());
514 }
515
510 ash::SystemTrayDelegate* ChromeShellDelegate::CreateSystemTrayDelegate() { 516 ash::SystemTrayDelegate* ChromeShellDelegate::CreateSystemTrayDelegate() {
511 return chromeos::CreateSystemTrayDelegate(); 517 return chromeos::CreateSystemTrayDelegate();
512 } 518 }
513 519
514 ash::UserWallpaperDelegate* ChromeShellDelegate::CreateUserWallpaperDelegate() { 520 ash::UserWallpaperDelegate* ChromeShellDelegate::CreateUserWallpaperDelegate() {
515 return chromeos::CreateUserWallpaperDelegate(); 521 return chromeos::CreateUserWallpaperDelegate();
516 } 522 }
517 523
518 void ChromeShellDelegate::Observe(int type, 524 void ChromeShellDelegate::Observe(int type,
519 const content::NotificationSource& source, 525 const content::NotificationSource& source,
(...skipping 26 matching lines...) Expand all
546 NOTREACHED() << "Unexpected notification " << type; 552 NOTREACHED() << "Unexpected notification " << type;
547 } 553 }
548 } 554 }
549 555
550 void ChromeShellDelegate::PlatformInit() { 556 void ChromeShellDelegate::PlatformInit() {
551 registrar_.Add(this, chrome::NOTIFICATION_LOGIN_USER_PROFILE_PREPARED, 557 registrar_.Add(this, chrome::NOTIFICATION_LOGIN_USER_PROFILE_PREPARED,
552 content::NotificationService::AllSources()); 558 content::NotificationService::AllSources());
553 registrar_.Add(this, chrome::NOTIFICATION_SESSION_STARTED, 559 registrar_.Add(this, chrome::NOTIFICATION_SESSION_STARTED,
554 content::NotificationService::AllSources()); 560 content::NotificationService::AllSources());
555 } 561 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/ash/chrome_shell_delegate.h ('k') | chrome/browser/ui/ash/palette_delegate_chromeos.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698