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

Side by Side Diff: ash/shelf/shelf_layout_manager.cc

Issue 1135323002: Revert of Have Notifications appear over docked windows (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 7 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 (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 840 matching lines...) Expand 10 before | Expand all | Expand 10 after
851 gfx::Rect(0, 0, 851 gfx::Rect(0, 0,
852 shelf_width - status_size.width(), 852 shelf_width - status_size.width(),
853 target_bounds->shelf_bounds_in_root.height()), 853 target_bounds->shelf_bounds_in_root.height()),
854 gfx::Rect(0, 0, target_bounds->shelf_bounds_in_root.width(), 854 gfx::Rect(0, 0, target_bounds->shelf_bounds_in_root.width(),
855 shelf_height - status_size.height()), 855 shelf_height - status_size.height()),
856 gfx::Rect(0, 0, target_bounds->shelf_bounds_in_root.width(), 856 gfx::Rect(0, 0, target_bounds->shelf_bounds_in_root.width(),
857 shelf_height - status_size.height()), 857 shelf_height - status_size.height()),
858 gfx::Rect(0, 0, 858 gfx::Rect(0, 0,
859 shelf_width - status_size.width(), 859 shelf_width - status_size.width(),
860 target_bounds->shelf_bounds_in_root.height())); 860 target_bounds->shelf_bounds_in_root.height()));
861
862 non_shelf_bounds_ = available_bounds;
863 non_shelf_bounds_.Subtract(target_bounds->shelf_bounds_in_root);
864 } 861 }
865 862
866 void ShelfLayoutManager::UpdateTargetBoundsForGesture( 863 void ShelfLayoutManager::UpdateTargetBoundsForGesture(
867 TargetBounds* target_bounds) const { 864 TargetBounds* target_bounds) const {
868 CHECK_EQ(GESTURE_DRAG_IN_PROGRESS, gesture_drag_status_); 865 CHECK_EQ(GESTURE_DRAG_IN_PROGRESS, gesture_drag_status_);
869 bool horizontal = IsHorizontalAlignment(); 866 bool horizontal = IsHorizontalAlignment();
870 const gfx::Rect& available_bounds(root_window_->bounds()); 867 const gfx::Rect& available_bounds(root_window_->bounds());
871 int resistance_free_region = 0; 868 int resistance_free_region = 0;
872 869
873 if (gesture_drag_auto_hide_state_ == SHELF_AUTO_HIDE_HIDDEN && 870 if (gesture_drag_auto_hide_state_ == SHELF_AUTO_HIDE_HIDDEN &&
(...skipping 315 matching lines...) Expand 10 before | Expand all | Expand 10 after
1189 return false; 1186 return false;
1190 } 1187 }
1191 if (session_state_delegate->IsUserSessionBlocked() || 1188 if (session_state_delegate->IsUserSessionBlocked() ||
1192 state_.is_adding_user_screen) { 1189 state_.is_adding_user_screen) {
1193 return true; 1190 return true;
1194 } 1191 }
1195 return false; 1192 return false;
1196 } 1193 }
1197 1194
1198 } // namespace ash 1195 } // namespace ash
OLDNEW
« no previous file with comments | « ash/shelf/shelf_layout_manager.h ('k') | ash/system/web_notification/ash_popup_alignment_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698