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

Issues Search
    My Issues | Starred     Open | Closed | All

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: 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/common/wm_shell.h ('k') | ash/mus/shell_delegate_mus.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/common/wm_shell.cc
diff --git a/ash/common/wm_shell.cc b/ash/common/wm_shell.cc
index b6a269c8ff7ad15bec13b0a7f39dd634d0d2abca..6d629cb9fdf30883d2eb9d38b48f61a8cef6079c 100644
--- a/ash/common/wm_shell.cc
+++ b/ash/common/wm_shell.cc
@@ -12,6 +12,7 @@
#include "ash/common/focus_cycler.h"
#include "ash/common/keyboard/keyboard_ui.h"
#include "ash/common/new_window_delegate.h"
+#include "ash/common/palette_delegate.h"
#include "ash/common/session/session_state_delegate.h"
#include "ash/common/shelf/app_list_shelf_item_delegate.h"
#include "ash/common/shelf/shelf_delegate.h"
@@ -61,6 +62,7 @@ void WmShell::Initialize() {
// instead of the WmShell constructor.
accessibility_delegate_.reset(delegate_->CreateAccessibilityDelegate());
media_delegate_.reset(delegate_->CreateMediaDelegate());
+ palette_delegate_ = delegate_->CreatePaletteDelegate();
toast_manager_.reset(new ToastManager);
// Create the app list item in the shelf data model.
« no previous file with comments | « ash/common/wm_shell.h ('k') | ash/mus/shell_delegate_mus.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698