Chromium Code Reviews| 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/shelf/shelf_layout_manager.h" | 5 #include "ash/shelf/shelf_layout_manager.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 #include <cmath> | 8 #include <cmath> |
| 9 #include <cstring> | 9 #include <cstring> |
| 10 #include <string> | 10 #include <string> |
| (...skipping 687 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 698 // animate. Override the animation settings to immediately set the | 698 // animate. Override the animation settings to immediately set the |
| 699 // visibility property. Opacity will still animate. | 699 // visibility property. Opacity will still animate. |
| 700 | 700 |
| 701 // TODO(harrym): Once status area widget is a child view of shelf | 701 // TODO(harrym): Once status area widget is a child view of shelf |
| 702 // this can be simplified. | 702 // this can be simplified. |
| 703 gfx::Rect status_bounds = target_bounds.status_bounds_in_shelf; | 703 gfx::Rect status_bounds = target_bounds.status_bounds_in_shelf; |
| 704 status_bounds.set_x(status_bounds.x() + | 704 status_bounds.set_x(status_bounds.x() + |
| 705 target_bounds.shelf_bounds_in_root.x()); | 705 target_bounds.shelf_bounds_in_root.x()); |
| 706 status_bounds.set_y(status_bounds.y() + | 706 status_bounds.set_y(status_bounds.y() + |
| 707 target_bounds.shelf_bounds_in_root.y()); | 707 target_bounds.shelf_bounds_in_root.y()); |
| 708 LOG(ERROR) << "Status Area Widget Bounds:" | |
|
msw
2016/02/02 22:54:10
Did you mean to land this? It's spamming logs, lik
| |
| 709 << ScreenUtil::ConvertRectToScreen( | |
| 710 shelf_->status_area_widget()->GetNativeView()->parent(), | |
| 711 status_bounds) | |
| 712 .ToString(); | |
| 713 | |
| 708 shelf_->status_area_widget()->SetBounds( | 714 shelf_->status_area_widget()->SetBounds( |
| 709 ScreenUtil::ConvertRectToScreen( | 715 ScreenUtil::ConvertRectToScreen( |
| 710 shelf_->status_area_widget()->GetNativeView()->parent(), | 716 shelf_->status_area_widget()->GetNativeView()->parent(), |
| 711 status_bounds)); | 717 status_bounds)); |
| 712 if (!state_.is_screen_locked) { | 718 if (!state_.is_screen_locked) { |
| 713 gfx::Insets insets; | 719 gfx::Insets insets; |
| 714 // If user session is blocked (login to new user session or add user to | 720 // If user session is blocked (login to new user session or add user to |
| 715 // the existing session - multi-profile) then give 100% of work area only | 721 // the existing session - multi-profile) then give 100% of work area only |
| 716 // if keyboard is not shown. | 722 // if keyboard is not shown. |
| 717 if (!state_.is_adding_user_screen || !keyboard_bounds_.IsEmpty()) { | 723 if (!state_.is_adding_user_screen || !keyboard_bounds_.IsEmpty()) { |
| (...skipping 487 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1205 return false; | 1211 return false; |
| 1206 } | 1212 } |
| 1207 if (session_state_delegate->IsUserSessionBlocked() || | 1213 if (session_state_delegate->IsUserSessionBlocked() || |
| 1208 state_.is_adding_user_screen) { | 1214 state_.is_adding_user_screen) { |
| 1209 return true; | 1215 return true; |
| 1210 } | 1216 } |
| 1211 return false; | 1217 return false; |
| 1212 } | 1218 } |
| 1213 | 1219 |
| 1214 } // namespace ash | 1220 } // namespace ash |
| OLD | NEW |