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

Unified 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: Created 4 years, 5 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/ash/chrome_shell_delegate.cc
diff --git a/chrome/browser/ui/ash/chrome_shell_delegate.cc b/chrome/browser/ui/ash/chrome_shell_delegate.cc
index eb20851f05d5e91e1374403e04dcad04e064d8f3..8cf7e68383a1015b7b3efa307128b848dc491c85 100644
--- a/chrome/browser/ui/ash/chrome_shell_delegate.cc
+++ b/chrome/browser/ui/ash/chrome_shell_delegate.cc
@@ -48,6 +48,7 @@
#include "chrome/browser/ui/ash/launcher/launcher_context_menu.h"
#include "chrome/browser/ui/ash/media_delegate_chromeos.h"
#include "chrome/browser/ui/ash/multi_user/multi_user_util.h"
+#include "chrome/browser/ui/ash/palette_delegate_chromeos.h"
#include "chrome/browser/ui/ash/session_state_delegate_chromeos.h"
#include "chrome/browser/ui/ash/session_util.h"
#include "chrome/browser/ui/ash/system_tray_delegate_chromeos.h"
@@ -503,6 +504,10 @@ ash::MediaDelegate* ChromeShellDelegate::CreateMediaDelegate() {
return new MediaDelegateChromeOS;
}
+ash::PaletteDelegate* ChromeShellDelegate::CreatePaletteDelegate() {
+ return new chromeos::PaletteDelegateChromeOS();
+}
+
ash::SystemTrayDelegate* ChromeShellDelegate::CreateSystemTrayDelegate() {
return chromeos::CreateSystemTrayDelegate();
}

Powered by Google App Engine
This is Rietveld 408576698