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

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') | ash/shelf/shelf_layout_manager.cc » ('J')
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 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
80 // Returns the docked area bounds. 80 // Returns the docked area bounds.
81 const gfx::Rect& dock_bounds() const { return dock_bounds_; } 81 const gfx::Rect& dock_bounds() const { return dock_bounds_; }
82 82
83 // Returns the bounds within the root window not occupied by the shelf nor the 83 // Returns the bounds within the root window not occupied by the shelf nor the
84 // virtual keyboard. 84 // virtual keyboard.
85 const gfx::Rect& user_work_area_bounds() const { 85 const gfx::Rect& user_work_area_bounds() const {
86 return user_work_area_bounds_; 86 return user_work_area_bounds_;
87 } 87 }
88 88
89 // Stops any animations and sets the bounds of the shelf and status widgets. 89 // Stops any animations and sets the bounds of the shelf and status widgets.
90 void LayoutShelfAndUpdateBounds(bool change_work_area);
91
92 // Stops any animations, sets the bounds of the shelf and status widgets, and
93 // changes the work area
90 void LayoutShelf(); 94 void LayoutShelf();
91 95
92 // Returns shelf visibility state based on current value of auto hide 96 // Returns shelf visibility state based on current value of auto hide
93 // behavior setting. 97 // behavior setting.
94 ShelfVisibilityState CalculateShelfVisibility(); 98 ShelfVisibilityState CalculateShelfVisibility();
95 99
96 // Updates the visibility state. 100 // Updates the visibility state.
97 void UpdateVisibilityState(); 101 void UpdateVisibilityState();
98 102
99 // Invoked by the shelf when the auto-hide state may have changed. 103 // Invoked by the shelf when the auto-hide state may have changed.
(...skipping 135 matching lines...) Expand 10 before | Expand all | Expand 10 after
235 wm::WorkspaceWindowState window_state; 239 wm::WorkspaceWindowState window_state;
236 bool is_screen_locked; 240 bool is_screen_locked;
237 bool is_adding_user_screen; 241 bool is_adding_user_screen;
238 }; 242 };
239 243
240 // Sets the visibility of the shelf to |state|. 244 // Sets the visibility of the shelf to |state|.
241 void SetState(ShelfVisibilityState visibility_state); 245 void SetState(ShelfVisibilityState visibility_state);
242 246
243 // Updates the bounds and opacity of the shelf and status widgets. 247 // Updates the bounds and opacity of the shelf and status widgets.
244 // If |observer| is specified, it will be called back when the animations, if 248 // If |observer| is specified, it will be called back when the animations, if
245 // any, are complete. 249 // any, are complete. |change_work_area| specifies whether or not to update
250 // the work area of the screen.
246 void UpdateBoundsAndOpacity(const TargetBounds& target_bounds, 251 void UpdateBoundsAndOpacity(const TargetBounds& target_bounds,
247 bool animate, 252 bool animate,
253 bool change_work_area,
248 ui::ImplicitAnimationObserver* observer); 254 ui::ImplicitAnimationObserver* observer);
249 255
250 // Stops any animations and progresses them to the end. 256 // Stops any animations and progresses them to the end.
251 void StopAnimating(); 257 void StopAnimating();
252 258
253 // Calculates the target bounds assuming visibility of |visible|. 259 // Calculates the target bounds assuming visibility of |visible|.
254 void CalculateTargetBounds(const State& state, TargetBounds* target_bounds); 260 void CalculateTargetBounds(const State& state, TargetBounds* target_bounds);
255 261
256 // Updates the target bounds if a gesture-drag is in progress. This is only 262 // Updates the target bounds if a gesture-drag is in progress. This is only
257 // used by |CalculateTargetBounds()|. 263 // used by |CalculateTargetBounds()|.
(...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after
373 379
374 std::unique_ptr<RootWindowControllerObserverImpl> 380 std::unique_ptr<RootWindowControllerObserverImpl>
375 root_window_controller_observer_; 381 root_window_controller_observer_;
376 382
377 DISALLOW_COPY_AND_ASSIGN(ShelfLayoutManager); 383 DISALLOW_COPY_AND_ASSIGN(ShelfLayoutManager);
378 }; 384 };
379 385
380 } // namespace ash 386 } // namespace ash
381 387
382 #endif // ASH_SHELF_SHELF_LAYOUT_MANAGER_H_ 388 #endif // ASH_SHELF_SHELF_LAYOUT_MANAGER_H_
OLDNEW
« no previous file with comments | « no previous file | ash/shelf/shelf_layout_manager.cc » ('j') | ash/shelf/shelf_layout_manager.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698