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

Side by Side Diff: components/exo/shell_surface.h

Issue 2743053002: arc: Fix race condition in applying modal state. (Closed)
Patch Set: unit_test added + refactored apply logic Created 3 years, 9 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 | components/exo/shell_surface.cc » ('j') | components/exo/shell_surface.cc » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 COMPONENTS_EXO_SHELL_SURFACE_H_ 5 #ifndef COMPONENTS_EXO_SHELL_SURFACE_H_
6 #define COMPONENTS_EXO_SHELL_SURFACE_H_ 6 #define COMPONENTS_EXO_SHELL_SURFACE_H_
7 7
8 #include <deque> 8 #include <deque>
9 #include <memory> 9 #include <memory>
10 #include <string> 10 #include <string>
(...skipping 289 matching lines...) Expand 10 before | Expand all | Expand 10 after
300 // Updates the bounds of widget to match the current surface bounds. 300 // Updates the bounds of widget to match the current surface bounds.
301 void UpdateWidgetBounds(); 301 void UpdateWidgetBounds();
302 302
303 // Updates the bounds of surface to match the current widget bounds. 303 // Updates the bounds of surface to match the current widget bounds.
304 void UpdateSurfaceBounds(); 304 void UpdateSurfaceBounds();
305 305
306 // Creates, deletes and update the shadow bounds based on 306 // Creates, deletes and update the shadow bounds based on
307 // |pending_shadow_content_bounds_|. 307 // |pending_shadow_content_bounds_|.
308 void UpdateShadow(); 308 void UpdateShadow();
309 309
310 // Applies |system_modal_| to |widget_|.
311 void UpdateSystemModal();
312
310 views::Widget* widget_ = nullptr; 313 views::Widget* widget_ = nullptr;
311 Surface* surface_; 314 Surface* surface_;
312 aura::Window* parent_; 315 aura::Window* parent_;
313 const BoundsMode bounds_mode_; 316 const BoundsMode bounds_mode_;
314 gfx::Point origin_; 317 gfx::Point origin_;
315 bool activatable_ = true; 318 bool activatable_ = true;
316 const bool can_minimize_; 319 const bool can_minimize_;
317 // Container Window Id (see ash/public/cpp/shell_window_ids.h) 320 // Container Window Id (see ash/public/cpp/shell_window_ids.h)
318 int container_; 321 int container_;
319 bool frame_enabled_ = false; 322 bool frame_enabled_ = false;
(...skipping 20 matching lines...) Expand all
340 aura::Window* shadow_underlay_ = nullptr; 343 aura::Window* shadow_underlay_ = nullptr;
341 std::unique_ptr<ui::EventHandler> shadow_underlay_event_handler_; 344 std::unique_ptr<ui::EventHandler> shadow_underlay_event_handler_;
342 gfx::Rect shadow_content_bounds_; 345 gfx::Rect shadow_content_bounds_;
343 float shadow_background_opacity_ = 1.0; 346 float shadow_background_opacity_ = 1.0;
344 std::deque<Config> pending_configs_; 347 std::deque<Config> pending_configs_;
345 std::unique_ptr<ash::WindowResizer> resizer_; 348 std::unique_ptr<ash::WindowResizer> resizer_;
346 std::unique_ptr<ScopedAnimationsDisabled> scoped_animations_disabled_; 349 std::unique_ptr<ScopedAnimationsDisabled> scoped_animations_disabled_;
347 int top_inset_height_ = 0; 350 int top_inset_height_ = 0;
348 int pending_top_inset_height_ = 0; 351 int pending_top_inset_height_ = 0;
349 bool shadow_underlay_in_surface_ = true; 352 bool shadow_underlay_in_surface_ = true;
353 bool system_modal_ = false;
350 354
351 DISALLOW_COPY_AND_ASSIGN(ShellSurface); 355 DISALLOW_COPY_AND_ASSIGN(ShellSurface);
352 }; 356 };
353 357
354 } // namespace exo 358 } // namespace exo
355 359
356 #endif // COMPONENTS_EXO_SHELL_SURFACE_H_ 360 #endif // COMPONENTS_EXO_SHELL_SURFACE_H_
OLDNEW
« no previous file with comments | « no previous file | components/exo/shell_surface.cc » ('j') | components/exo/shell_surface.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698