| OLD | NEW |
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "ash/common/system/chromeos/palette/palette_tray.h" | 5 #include "ash/common/system/chromeos/palette/palette_tray.h" |
| 6 | 6 |
| 7 #include "ash/common/material_design/material_design_controller.h" | 7 #include "ash/common/material_design/material_design_controller.h" |
| 8 #include "ash/common/session/session_state_delegate.h" | 8 #include "ash/common/session/session_state_delegate.h" |
| 9 #include "ash/common/shelf/shelf_constants.h" | 9 #include "ash/common/shelf/shelf_constants.h" |
| 10 #include "ash/common/shelf/wm_shelf.h" | 10 #include "ash/common/shelf/wm_shelf.h" |
| (...skipping 14 matching lines...) Expand all Loading... |
| 25 #include "ash/resources/vector_icons/vector_icons.h" | 25 #include "ash/resources/vector_icons/vector_icons.h" |
| 26 #include "ash/root_window_controller.h" | 26 #include "ash/root_window_controller.h" |
| 27 #include "ash/strings/grit/ash_strings.h" | 27 #include "ash/strings/grit/ash_strings.h" |
| 28 #include "base/metrics/histogram_macros.h" | 28 #include "base/metrics/histogram_macros.h" |
| 29 #include "ui/base/l10n/l10n_util.h" | 29 #include "ui/base/l10n/l10n_util.h" |
| 30 #include "ui/base/resource/resource_bundle.h" | 30 #include "ui/base/resource/resource_bundle.h" |
| 31 #include "ui/events/devices/input_device_manager.h" | 31 #include "ui/events/devices/input_device_manager.h" |
| 32 #include "ui/events/devices/stylus_state.h" | 32 #include "ui/events/devices/stylus_state.h" |
| 33 #include "ui/gfx/color_palette.h" | 33 #include "ui/gfx/color_palette.h" |
| 34 #include "ui/gfx/paint_vector_icon.h" | 34 #include "ui/gfx/paint_vector_icon.h" |
| 35 #include "ui/gfx/vector_icons_public.h" | |
| 36 #include "ui/views/controls/image_view.h" | 35 #include "ui/views/controls/image_view.h" |
| 37 #include "ui/views/controls/label.h" | 36 #include "ui/views/controls/label.h" |
| 38 #include "ui/views/controls/separator.h" | 37 #include "ui/views/controls/separator.h" |
| 39 #include "ui/views/layout/box_layout.h" | 38 #include "ui/views/layout/box_layout.h" |
| 40 #include "ui/views/layout/fill_layout.h" | 39 #include "ui/views/layout/fill_layout.h" |
| 41 | 40 |
| 42 namespace ash { | 41 namespace ash { |
| 43 | 42 |
| 44 namespace { | 43 namespace { |
| 45 | 44 |
| (...skipping 382 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 428 UpdateIconVisibility(); | 427 UpdateIconVisibility(); |
| 429 } | 428 } |
| 430 } | 429 } |
| 431 | 430 |
| 432 void PaletteTray::UpdateIconVisibility() { | 431 void PaletteTray::UpdateIconVisibility() { |
| 433 SetVisible(is_palette_enabled_ && palette_utils::HasStylusInput() && | 432 SetVisible(is_palette_enabled_ && palette_utils::HasStylusInput() && |
| 434 IsInUserSession()); | 433 IsInUserSession()); |
| 435 } | 434 } |
| 436 | 435 |
| 437 } // namespace ash | 436 } // namespace ash |
| OLD | NEW |