OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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/user/user_card_view.h" | 5 #include "ash/system/user/user_card_view.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 #include <memory> | 8 #include <memory> |
9 #include <vector> | 9 #include <vector> |
10 | 10 |
11 #include "ash/common/ash_view_ids.h" | 11 #include "ash/ash_view_ids.h" |
12 #include "ash/common/login_status.h" | 12 #include "ash/login_status.h" |
13 #include "ash/common/media_controller.h" | 13 #include "ash/media_controller.h" |
14 #include "ash/common/session/session_state_delegate.h" | |
15 #include "ash/common/wm_shell.h" | |
16 #include "ash/resources/vector_icons/vector_icons.h" | 14 #include "ash/resources/vector_icons/vector_icons.h" |
| 15 #include "ash/session/session_state_delegate.h" |
17 #include "ash/strings/grit/ash_strings.h" | 16 #include "ash/strings/grit/ash_strings.h" |
18 #include "ash/system/tray/system_tray_controller.h" | 17 #include "ash/system/tray/system_tray_controller.h" |
19 #include "ash/system/tray/system_tray_delegate.h" | 18 #include "ash/system/tray/system_tray_delegate.h" |
20 #include "ash/system/tray/tray_constants.h" | 19 #include "ash/system/tray/tray_constants.h" |
21 #include "ash/system/tray/tray_popup_item_style.h" | 20 #include "ash/system/tray/tray_popup_item_style.h" |
22 #include "ash/system/user/rounded_image_view.h" | 21 #include "ash/system/user/rounded_image_view.h" |
| 22 #include "ash/wm_shell.h" |
23 #include "base/i18n/rtl.h" | 23 #include "base/i18n/rtl.h" |
24 #include "base/memory/ptr_util.h" | 24 #include "base/memory/ptr_util.h" |
25 #include "base/strings/string16.h" | 25 #include "base/strings/string16.h" |
26 #include "base/strings/string_util.h" | 26 #include "base/strings/string_util.h" |
27 #include "base/strings/utf_string_conversions.h" | 27 #include "base/strings/utf_string_conversions.h" |
28 #include "components/user_manager/user_info.h" | 28 #include "components/user_manager/user_info.h" |
29 #include "ui/accessibility/ax_node_data.h" | 29 #include "ui/accessibility/ax_node_data.h" |
30 #include "ui/base/l10n/l10n_util.h" | 30 #include "ui/base/l10n/l10n_util.h" |
31 #include "ui/compositor/compositing_recorder.h" | 31 #include "ui/compositor/compositing_recorder.h" |
32 #include "ui/gfx/canvas.h" | 32 #include "ui/gfx/canvas.h" |
(...skipping 428 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
461 | 461 |
462 media_capture_icon_->set_id(VIEW_ID_USER_VIEW_MEDIA_INDICATOR); | 462 media_capture_icon_->set_id(VIEW_ID_USER_VIEW_MEDIA_INDICATOR); |
463 AddChildView(media_capture_icon_); | 463 AddChildView(media_capture_icon_); |
464 | 464 |
465 WmShell::Get()->media_controller()->RequestCaptureState(); | 465 WmShell::Get()->media_controller()->RequestCaptureState(); |
466 } | 466 } |
467 } | 467 } |
468 | 468 |
469 } // namespace tray | 469 } // namespace tray |
470 } // namespace ash | 470 } // namespace ash |
OLD | NEW |