Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(429)

Side by Side Diff: ash/system/cast/tray_cast.cc

Issue 2048443002: ABANDONED: mash: Move shell delegate interfaces to ash/common (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@moveshelfmodel
Patch Set: 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
OLDNEW
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/shelf/shelf_types.h" 8 #include "ash/common/shelf/shelf_types.h"
8 #include "ash/common/shelf/wm_shelf_util.h" 9 #include "ash/common/shelf/wm_shelf_util.h"
9 #include "ash/session/session_state_delegate.h"
10 #include "ash/shelf/shelf_util.h" 10 #include "ash/shelf/shelf_util.h"
11 #include "ash/shell.h" 11 #include "ash/shell.h"
12 #include "ash/system/chromeos/screen_security/screen_tray_item.h" 12 #include "ash/system/chromeos/screen_security/screen_tray_item.h"
13 #include "ash/system/tray/fixed_sized_image_view.h" 13 #include "ash/system/tray/fixed_sized_image_view.h"
14 #include "ash/system/tray/fixed_sized_scroll_view.h" 14 #include "ash/system/tray/fixed_sized_scroll_view.h"
15 #include "ash/system/tray/hover_highlight_view.h" 15 #include "ash/system/tray/hover_highlight_view.h"
16 #include "ash/system/tray/system_tray.h" 16 #include "ash/system/tray/system_tray.h"
17 #include "ash/system/tray/system_tray_delegate.h" 17 #include "ash/system/tray/system_tray_delegate.h"
18 #include "ash/system/tray/system_tray_notifier.h" 18 #include "ash/system/tray/system_tray_notifier.h"
19 #include "ash/system/tray/throbber_view.h" 19 #include "ash/system/tray/throbber_view.h"
(...skipping 653 matching lines...) Expand 10 before | Expand all | Expand 10 after
673 is_casting_ = started; 673 is_casting_ = started;
674 UpdatePrimaryView(); 674 UpdatePrimaryView();
675 } 675 }
676 676
677 void TrayCast::UpdateAfterShelfAlignmentChange(ShelfAlignment alignment) { 677 void TrayCast::UpdateAfterShelfAlignmentChange(ShelfAlignment alignment) {
678 if (tray_) 678 if (tray_)
679 tray_->UpdateAlignment(alignment); 679 tray_->UpdateAlignment(alignment);
680 } 680 }
681 681
682 } // namespace ash 682 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698