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

Side by Side Diff: ash/system/chromeos/screen_security/screen_tray_item.cc

Issue 1914093002: Refactors DockedWindowLayoutManager in terms of ash/wm/common (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@nuke_aura_window
Patch Set: comment Created 4 years, 8 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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/screen_security/screen_tray_item.h" 5 #include "ash/system/chromeos/screen_security/screen_tray_item.h"
6 6
7 #include "ash/shelf/shelf_util.h" 7 #include "ash/shelf/shelf_util.h"
8 #include "ash/system/tray/fixed_sized_image_view.h" 8 #include "ash/system/tray/fixed_sized_image_view.h"
9 #include "ash/system/tray/tray_constants.h" 9 #include "ash/system/tray/tray_constants.h"
10 #include "ui/base/resource/resource_bundle.h" 10 #include "ui/base/resource/resource_bundle.h"
(...skipping 165 matching lines...) Expand 10 before | Expand all | Expand 10 after
176 } 176 }
177 177
178 void ScreenTrayItem::DestroyTrayView() { 178 void ScreenTrayItem::DestroyTrayView() {
179 tray_view_ = NULL; 179 tray_view_ = NULL;
180 } 180 }
181 181
182 void ScreenTrayItem::DestroyDefaultView() { 182 void ScreenTrayItem::DestroyDefaultView() {
183 default_view_ = NULL; 183 default_view_ = NULL;
184 } 184 }
185 185
186 void ScreenTrayItem::UpdateAfterShelfAlignmentChange(ShelfAlignment alignment) { 186 void ScreenTrayItem::UpdateAfterShelfAlignmentChange(
187 wm::ShelfAlignment alignment) {
187 if (!tray_view_) 188 if (!tray_view_)
188 return; 189 return;
189 190
190 // Center the item dependent on the orientation of the shelf. 191 // Center the item dependent on the orientation of the shelf.
191 views::BoxLayout::Orientation layout = IsHorizontalAlignment(alignment) 192 views::BoxLayout::Orientation layout = IsHorizontalAlignment(alignment)
192 ? views::BoxLayout::kHorizontal 193 ? views::BoxLayout::kHorizontal
193 : views::BoxLayout::kVertical; 194 : views::BoxLayout::kVertical;
194 tray_view_->SetLayoutManager(new views::BoxLayout(layout, 0, 0, 0)); 195 tray_view_->SetLayoutManager(new views::BoxLayout(layout, 0, 0, 0));
195 tray_view_->Layout(); 196 tray_view_->Layout();
196 } 197 }
197 198
198 } // namespace ash 199 } // namespace ash
OLDNEW
« no previous file with comments | « ash/system/chromeos/screen_security/screen_tray_item.h ('k') | ash/system/chromeos/session/logout_button_tray.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698