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

Unified Diff: ash/common/wm_shell.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: ash/common/wm_shell.cc
diff --git a/ash/common/wm_shell.cc b/ash/common/wm_shell.cc
index 5ad467936d6084b6acf71476fb8afad4a51c1659..a2e2ba1e0d0458c30e28350e53683dae4dd65fc0 100644
--- a/ash/common/wm_shell.cc
+++ b/ash/common/wm_shell.cc
@@ -35,6 +35,7 @@
#include "ui/views/focus/focus_manager_factory.h"
#if defined(OS_CHROMEOS)
+#include "ash/common/palette_delegate.h"
#include "ash/common/system/chromeos/brightness/brightness_controller_chromeos.h"
#include "ash/common/system/chromeos/keyboard_brightness_controller.h"
#include "ash/common/system/chromeos/session/logout_confirmation_controller.h"
@@ -60,6 +61,7 @@ void WmShell::Initialize() {
// instead of the WmShell constructor.
accessibility_delegate_.reset(delegate_->CreateAccessibilityDelegate());
media_delegate_.reset(delegate_->CreateMediaDelegate());
+ palette_delegate_.reset(delegate_->CreatePaletteDelegate());
toast_manager_.reset(new ToastManager);
// Create the app list item in the shelf data model.

Powered by Google App Engine
This is Rietveld 408576698