ash/system/chromeos/tray_display.cc - Issue 2072013002: mash: Move tray settings and deps to common.

Side by Side Diff: ash/system/chromeos/tray_display.cc

Issue 2072013002: mash: Move tray settings and deps to common. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Undo 'git cl format' and nullptr changes. Created 4 years, 6 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 unified diff | Download patch

OLD	NEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2012 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/system/chromeos/tray_display.h"	5 #include "ash/system/chromeos/tray_display.h"

6	6

7 #include <memory>	7 #include <memory>

8 #include <utility>	8 #include <utility>

9 #include <vector>	9 #include <vector>

10	10

	11 #include "ash/common/system/chromeos/devicetype_utils.h"

	12 #include "ash/common/system/system_notifier.h"

11 #include "ash/common/system/tray/actionable_view.h"	13 #include "ash/common/system/tray/actionable_view.h"

12 #include "ash/common/system/tray/fixed_sized_image_view.h"	14 #include "ash/common/system/tray/fixed_sized_image_view.h"

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

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

15 #include "ash/common/system/tray/tray_notification_view.h"	17 #include "ash/common/system/tray/tray_notification_view.h"

16 #include "ash/common/wm_shell.h"	18 #include "ash/common/wm_shell.h"

17 #include "ash/display/display_manager.h"	19 #include "ash/display/display_manager.h"

18 #include "ash/display/screen_orientation_controller_chromeos.h"	20 #include "ash/display/screen_orientation_controller_chromeos.h"

19 #include "ash/display/window_tree_host_manager.h"	21 #include "ash/display/window_tree_host_manager.h"

20 #include "ash/shell.h"	22 #include "ash/shell.h"

21 #include "ash/system/chromeos/devicetype_utils.h"

22 #include "ash/system/system_notifier.h"

23 #include "ash/system/tray/system_tray.h"	23 #include "ash/system/tray/system_tray.h"

24 #include "base/bind.h"	24 #include "base/bind.h"

25 #include "base/strings/string_util.h"	25 #include "base/strings/string_util.h"

26 #include "base/strings/utf_string_conversions.h"	26 #include "base/strings/utf_string_conversions.h"

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

28 #include "grit/ash_strings.h"	28 #include "grit/ash_strings.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/display/display.h"	31 #include "ui/display/display.h"

32 #include "ui/message_center/message_center.h"	32 #include "ui/message_center/message_center.h"

(...skipping 421 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
454 bool TrayDisplay::GetAccessibleStateForTesting(ui::AXViewState* state) {	454 bool TrayDisplay::GetAccessibleStateForTesting(ui::AXViewState* state) {

455 views::View* view = default_;	455 views::View* view = default_;

456 if (view) {	456 if (view) {

457 view->GetAccessibleState(state);	457 view->GetAccessibleState(state);

458 return true;	458 return true;

459 }	459 }

460 return false;	460 return false;

461 }	461 }

462	462

463 } // namespace ash	463 } // namespace ash

OLD	NEW

« ash/common/DEPS ('K') | « ash/system/chromeos/supervised/tray_supervised_user.cc ('k') | ash/system/chromeos/tray_display_unittest.cc » ('j') | no next file with comments »