| 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 83aa4452a8f866d5435de776caf9bec63c2b16cf..d28e7f7addf7e8ff3b634992673e8953730f8d83 100644
|
| --- a/ash/common/system/chromeos/palette/palette_tray.cc
|
| +++ b/ash/common/system/chromeos/palette/palette_tray.cc
|
| @@ -12,6 +12,7 @@
|
| #include "ash/common/shell_window_ids.h"
|
| #include "ash/common/system/chromeos/palette/palette_tool.h"
|
| #include "ash/common/system/chromeos/palette/palette_tool_manager.h"
|
| +#include "ash/common/system/chromeos/palette/palette_utils.h"
|
| #include "ash/common/system/tray/system_tray_delegate.h"
|
| #include "ash/common/system/tray/tray_bubble_wrapper.h"
|
| #include "ash/common/system/tray/tray_constants.h"
|
| @@ -47,12 +48,6 @@ const int kVerticalShelfVerticalPadding = 5;
|
| // Width of the palette itself (dp).
|
| const int kPaletteWidth = 360;
|
|
|
| -// Returns true if the command line flag is present that enables the palette.
|
| -bool IsPaletteEnabled() {
|
| - return base::CommandLine::ForCurrentProcess()->HasSwitch(
|
| - ash::switches::kAshEnablePalette);
|
| -}
|
| -
|
| // Creates a separator.
|
| views::Separator* CreateSeparator(views::Separator::Orientation orientation) {
|
| const int kSeparatorInset = 10;
|
|
|