| OLD | NEW |
|---|
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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/cast/tray_cast.h" | 5 #include "ash/system/cast/tray_cast.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_types.h" | 8 #include "ash/common/shelf/shelf_types.h" |
| 9 #include "ash/common/shelf/wm_shelf_util.h" | 9 #include "ash/common/shelf/wm_shelf_util.h" |
| 10 #include "ash/common/system/tray/fixed_sized_image_view.h" | 10 #include "ash/common/system/tray/fixed_sized_image_view.h" |
| 11 #include "ash/common/system/tray/fixed_sized_scroll_view.h" | 11 #include "ash/common/system/tray/fixed_sized_scroll_view.h" |
| 12 #include "ash/common/system/tray/hover_highlight_view.h" | 12 #include "ash/common/system/tray/hover_highlight_view.h" |
| 13 #include "ash/common/system/tray/system_tray_delegate.h" | 13 #include "ash/common/system/tray/system_tray_delegate.h" |
| 14 #include "ash/common/system/tray/throbber_view.h" | 14 #include "ash/common/system/tray/throbber_view.h" |
| 15 #include "ash/common/system/tray/tray_constants.h" | 15 #include "ash/common/system/tray/tray_constants.h" |
| 16 #include "ash/common/system/tray/tray_details_view.h" | 16 #include "ash/common/system/tray/tray_details_view.h" |
| 17 #include "ash/common/system/tray/tray_item_more.h" | 17 #include "ash/common/system/tray/tray_item_more.h" |
| 18 #include "ash/common/system/tray/tray_item_view.h" | 18 #include "ash/common/system/tray/tray_item_view.h" |
| 19 #include "ash/common/system/tray/tray_popup_label_button.h" | 19 #include "ash/common/system/tray/tray_popup_label_button.h" |
| 20 #include "ash/common/system/tray/view_click_listener.h" | 20 #include "ash/common/system/tray/view_click_listener.h" |
| 21 #include "ash/common/wm_shell.h" | 21 #include "ash/common/wm_shell.h" |
| 22 #include "ash/shelf/shelf_util.h" | |
| 23 #include "ash/system/chromeos/screen_security/screen_tray_item.h" | 22 #include "ash/system/chromeos/screen_security/screen_tray_item.h" |
| 24 #include "ash/system/tray/system_tray.h" | 23 #include "ash/system/tray/system_tray.h" |
| 25 #include "ash/system/tray/system_tray_notifier.h" | 24 #include "ash/system/tray/system_tray_notifier.h" |
| 26 #include "base/bind.h" | 25 #include "base/bind.h" |
| 27 #include "grit/ash_resources.h" | 26 #include "grit/ash_resources.h" |
| 28 #include "grit/ash_strings.h" | 27 #include "grit/ash_strings.h" |
| 29 #include "ui/base/l10n/l10n_util.h" | 28 #include "ui/base/l10n/l10n_util.h" |
| 30 #include "ui/base/resource/resource_bundle.h" | 29 #include "ui/base/resource/resource_bundle.h" |
| 31 #include "ui/gfx/image/image.h" | 30 #include "ui/gfx/image/image.h" |
| 32 #include "ui/gfx/text_elider.h" | 31 #include "ui/gfx/text_elider.h" |
| (...skipping 634 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 667 is_casting_ = started; | 666 is_casting_ = started; |
| 668 UpdatePrimaryView(); | 667 UpdatePrimaryView(); |
| 669 } | 668 } |
| 670 | 669 |
| 671 void TrayCast::UpdateAfterShelfAlignmentChange(ShelfAlignment alignment) { | 670 void TrayCast::UpdateAfterShelfAlignmentChange(ShelfAlignment alignment) { |
| 672 if (tray_) | 671 if (tray_) |
| 673 tray_->UpdateAlignment(alignment); | 672 tray_->UpdateAlignment(alignment); |
| 674 } | 673 } |
| 675 | 674 |
| 676 } // namespace ash | 675 } // namespace ash |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 2093283002:
mash: Convert all of //ash/system to use WmShelf (Closed)
Base URL: https://chromium.googlesource.com/chromium/src.git@master