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

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

Issue 2200963002: ShelfLayoutManager virtual keyboard - do not change work area of screen if in non-sticky mode. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: ShelfLayoutManager virtual keyboard - do not change work area of screen if in non-sticky mode. Created 4 years, 4 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
« no previous file with comments | « no previous file | ash/shelf/shelf_layout_manager.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2012 The Chromium Authors. All rights reserved. 1 // Copyright 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 #ifndef ASH_SHELF_SHELF_LAYOUT_MANAGER_H_ 5 #ifndef ASH_SHELF_SHELF_LAYOUT_MANAGER_H_
6 #define ASH_SHELF_SHELF_LAYOUT_MANAGER_H_ 6 #define ASH_SHELF_SHELF_LAYOUT_MANAGER_H_
7 7
8 #include <memory> 8 #include <memory>
9 9
10 #include "ash/ash_export.h" 10 #include "ash/ash_export.h"
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
78 // Returns the docked area bounds. 78 // Returns the docked area bounds.
79 const gfx::Rect& dock_bounds() const { return dock_bounds_; } 79 const gfx::Rect& dock_bounds() const { return dock_bounds_; }
80 80
81 // Returns the bounds within the root window not occupied by the shelf nor the 81 // Returns the bounds within the root window not occupied by the shelf nor the
82 // virtual keyboard. 82 // virtual keyboard.
83 const gfx::Rect& user_work_area_bounds() const { 83 const gfx::Rect& user_work_area_bounds() const {
84 return user_work_area_bounds_; 84 return user_work_area_bounds_;
85 } 85 }
86 86
87 // Stops any animations and sets the bounds of the shelf and status widgets. 87 // Stops any animations and sets the bounds of the shelf and status widgets.
88 void LayoutShelfAndUpdateBounds(bool change_work_area);
89
90 // Stops any animations, sets the bounds of the shelf and status widgets, and
91 // changes the work area
88 void LayoutShelf(); 92 void LayoutShelf();
89 93
90 // Returns shelf visibility state based on current value of auto hide 94 // Returns shelf visibility state based on current value of auto hide
91 // behavior setting. 95 // behavior setting.
92 ShelfVisibilityState CalculateShelfVisibility(); 96 ShelfVisibilityState CalculateShelfVisibility();
93 97
94 // Updates the visibility state. 98 // Updates the visibility state.
95 void UpdateVisibilityState(); 99 void UpdateVisibilityState();
96 100
97 // Invoked by the shelf when the auto-hide state may have changed. 101 // Invoked by the shelf when the auto-hide state may have changed.
(...skipping 130 matching lines...) Expand 10 before | Expand all | Expand 10 after
228 wm::WorkspaceWindowState window_state; 232 wm::WorkspaceWindowState window_state;
229 bool is_screen_locked; 233 bool is_screen_locked;
230 bool is_adding_user_screen; 234 bool is_adding_user_screen;
231 }; 235 };
232 236
233 // Sets the visibility of the shelf to |state|. 237 // Sets the visibility of the shelf to |state|.
234 void SetState(ShelfVisibilityState visibility_state); 238 void SetState(ShelfVisibilityState visibility_state);
235 239
236 // Updates the bounds and opacity of the shelf and status widgets. 240 // Updates the bounds and opacity of the shelf and status widgets.
237 // If |observer| is specified, it will be called back when the animations, if 241 // If |observer| is specified, it will be called back when the animations, if
238 // any, are complete. 242 // any, are complete. |change_work_area| specifies whether or not to update
243 // the work area of the screen.
239 void UpdateBoundsAndOpacity(const TargetBounds& target_bounds, 244 void UpdateBoundsAndOpacity(const TargetBounds& target_bounds,
240 bool animate, 245 bool animate,
246 bool change_work_area,
241 ui::ImplicitAnimationObserver* observer); 247 ui::ImplicitAnimationObserver* observer);
242 248
243 // Stops any animations and progresses them to the end. 249 // Stops any animations and progresses them to the end.
244 void StopAnimating(); 250 void StopAnimating();
245 251
246 // Calculates the target bounds assuming visibility of |visible|. 252 // Calculates the target bounds assuming visibility of |visible|.
247 void CalculateTargetBounds(const State& state, TargetBounds* target_bounds); 253 void CalculateTargetBounds(const State& state, TargetBounds* target_bounds);
248 254
249 // Updates the target bounds if a gesture-drag is in progress. This is only 255 // Updates the target bounds if a gesture-drag is in progress. This is only
250 // used by |CalculateTargetBounds()|. 256 // used by |CalculateTargetBounds()|.
(...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after
365 371
366 std::unique_ptr<RootWindowControllerObserverImpl> 372 std::unique_ptr<RootWindowControllerObserverImpl>
367 root_window_controller_observer_; 373 root_window_controller_observer_;
368 374
369 DISALLOW_COPY_AND_ASSIGN(ShelfLayoutManager); 375 DISALLOW_COPY_AND_ASSIGN(ShelfLayoutManager);
370 }; 376 };
371 377
372 } // namespace ash 378 } // namespace ash
373 379
374 #endif // ASH_SHELF_SHELF_LAYOUT_MANAGER_H_ 380 #endif // ASH_SHELF_SHELF_LAYOUT_MANAGER_H_
OLDNEW
« no previous file with comments | « no previous file | ash/shelf/shelf_layout_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698