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

Unified Diff: ash/common/system/chromeos/palette/palette_tray.cc

Issue 2170173002: Add switch to enable palette tray UI. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@stylus-tray
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
« no previous file with comments | « ash/common/ash_switches.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/common/system/chromeos/palette/palette_tray.cc
diff --git a/ash/common/system/chromeos/palette/palette_tray.cc b/ash/common/system/chromeos/palette/palette_tray.cc
index c93e8fc94bba6cc25033eb5f2782fae78f18f705..45d8d8e8cfbcb56bb2dbf39290a9006fafc062aa 100644
--- a/ash/common/system/chromeos/palette/palette_tray.cc
+++ b/ash/common/system/chromeos/palette/palette_tray.cc
@@ -4,6 +4,7 @@
#include "ash/common/system/chromeos/palette/palette_tray.h"
+#include "ash/common/ash_switches.h"
#include "ash/common/material_design/material_design_controller.h"
#include "ash/common/shelf/shelf_constants.h"
#include "ash/common/shelf/wm_shelf.h"
@@ -19,6 +20,7 @@
#include "ash/common/wm_root_window_controller.h"
#include "ash/common/wm_shell.h"
#include "ash/common/wm_window.h"
+#include "base/command_line.h"
#include "base/sys_info.h"
#include "grit/ash_resources.h"
#include "grit/ash_strings.h"
@@ -50,8 +52,8 @@ const int kBubbleViewTopMargin = 7;
// Returns true if the command line flag is present that enables the palette.
bool IsPaletteEnabled() {
- // TODO(jdufault): Hookup this function when the flag is in Chrome.
- return false;
+ return base::CommandLine::ForCurrentProcess()->HasSwitch(
+ ash::switches::kAshEnablePalette);
}
// Creates a separator.
« no previous file with comments | « ash/common/ash_switches.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698