ash/common/system/chromeos/palette/palette_tray.cc - Issue 2430593002: mash: Use ash shell window container ids instead of ash::mojom::Container

Side by Side Diff: ash/common/system/chromeos/palette/palette_tray.cc

Issue 2430593002: mash: Use ash shell window container ids instead of ash::mojom::Container (Closed)

Patch Set: rebase Created 4 years, 2 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:

« no previous file with comments | « ash/common/system/chromeos/network/network_state_list_detailed_view.cc ('k') | ash/common/system/chromeos/session/logout_confirmation_dialog.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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/session/session_state_delegate.h"	7 #include "ash/common/session/session_state_delegate.h"

8 #include "ash/common/shelf/shelf_constants.h"	8 #include "ash/common/shelf/shelf_constants.h"

9 #include "ash/common/shelf/wm_shelf.h"	9 #include "ash/common/shelf/wm_shelf.h"

10 #include "ash/common/shelf/wm_shelf_util.h"	10 #include "ash/common/shelf/wm_shelf_util.h"

11 #include "ash/common/shell_window_ids.h"

12 #include "ash/common/system/chromeos/palette/palette_tool_manager.h"	11 #include "ash/common/system/chromeos/palette/palette_tool_manager.h"

13 #include "ash/common/system/chromeos/palette/palette_utils.h"	12 #include "ash/common/system/chromeos/palette/palette_utils.h"

14 #include "ash/common/system/tray/system_tray_controller.h"	13 #include "ash/common/system/tray/system_tray_controller.h"

15 #include "ash/common/system/tray/system_tray_delegate.h"	14 #include "ash/common/system/tray/system_tray_delegate.h"

16 #include "ash/common/system/tray/tray_bubble_wrapper.h"	15 #include "ash/common/system/tray/tray_bubble_wrapper.h"

17 #include "ash/common/system/tray/tray_constants.h"	16 #include "ash/common/system/tray/tray_constants.h"

18 #include "ash/common/system/tray/tray_popup_header_button.h"	17 #include "ash/common/system/tray/tray_popup_header_button.h"

19 #include "ash/common/wm_lookup.h"	18 #include "ash/common/wm_lookup.h"

20 #include "ash/common/wm_root_window_controller.h"	19 #include "ash/common/wm_root_window_controller.h"

21 #include "ash/common/wm_shell.h"	20 #include "ash/common/wm_shell.h"

22 #include "ash/common/wm_window.h"	21 #include "ash/common/wm_window.h"

	22 #include "ash/public/cpp/shell_window_ids.h"

23 #include "ash/resources/vector_icons/vector_icons.h"	23 #include "ash/resources/vector_icons/vector_icons.h"

24 #include "base/metrics/histogram_macros.h"	24 #include "base/metrics/histogram_macros.h"

25 #include "grit/ash_resources.h"	25 #include "grit/ash_resources.h"

26 #include "grit/ash_strings.h"	26 #include "grit/ash_strings.h"

27 #include "ui/base/l10n/l10n_util.h"	27 #include "ui/base/l10n/l10n_util.h"

28 #include "ui/base/resource/resource_bundle.h"	28 #include "ui/base/resource/resource_bundle.h"

29 #include "ui/events/devices/stylus_state.h"	29 #include "ui/events/devices/stylus_state.h"

30 #include "ui/gfx/color_palette.h"	30 #include "ui/gfx/color_palette.h"

31 #include "ui/gfx/paint_vector_icon.h"	31 #include "ui/gfx/paint_vector_icon.h"

32 #include "ui/gfx/vector_icons_public.h"	32 #include "ui/gfx/vector_icons_public.h"

(...skipping 424 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
457 } else {	457 } else {

458 UpdateIconVisibility();	458 UpdateIconVisibility();

459 }	459 }

460 }	460 }

461	461

462 void PaletteTray::UpdateIconVisibility() {	462 void PaletteTray::UpdateIconVisibility() {

463 SetVisible(IsInUserSession());	463 SetVisible(IsInUserSession());

464 }	464 }

465	465

466 } // namespace ash	466 } // namespace ash

OLD	NEW