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

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

Issue 2430593002: mash: Use ash shell window container ids instead of ash::mojom::Container (Closed)
Patch Set: rebase Created 4 years, 2 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 | « components/exo/pointer_unittest.cc ('k') | components/exo/shell_surface.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 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 253 matching lines...) Expand 10 before | Expand all | Expand 10 after
264 264
265 // Creates, deletes and update the shadow bounds based on 265 // Creates, deletes and update the shadow bounds based on
266 // |pending_shadow_content_bounds_|. 266 // |pending_shadow_content_bounds_|.
267 void UpdateShadow(); 267 void UpdateShadow();
268 268
269 views::Widget* widget_ = nullptr; 269 views::Widget* widget_ = nullptr;
270 Surface* surface_; 270 Surface* surface_;
271 aura::Window* parent_; 271 aura::Window* parent_;
272 const gfx::Rect initial_bounds_; 272 const gfx::Rect initial_bounds_;
273 const bool activatable_; 273 const bool activatable_;
274 // Container Window Id (see ash/common/shell_window_ids.h) 274 // Container Window Id (see ash/public/cpp/shell_window_ids.h)
275 const int container_; 275 const int container_;
276 bool pending_show_widget_ = false; 276 bool pending_show_widget_ = false;
277 base::string16 title_; 277 base::string16 title_;
278 std::string application_id_; 278 std::string application_id_;
279 gfx::Rect geometry_; 279 gfx::Rect geometry_;
280 gfx::Rect pending_geometry_; 280 gfx::Rect pending_geometry_;
281 double scale_ = 1.0; 281 double scale_ = 1.0;
282 double pending_scale_ = 1.0; 282 double pending_scale_ = 1.0;
283 base::Closure close_callback_; 283 base::Closure close_callback_;
284 base::Closure surface_destroyed_callback_; 284 base::Closure surface_destroyed_callback_;
(...skipping 16 matching lines...) Expand all
301 int top_inset_height_ = 0; 301 int top_inset_height_ = 0;
302 int pending_top_inset_height_ = 0; 302 int pending_top_inset_height_ = 0;
303 float rectangular_shadow_background_opacity_ = 1.0; 303 float rectangular_shadow_background_opacity_ = 1.0;
304 304
305 DISALLOW_COPY_AND_ASSIGN(ShellSurface); 305 DISALLOW_COPY_AND_ASSIGN(ShellSurface);
306 }; 306 };
307 307
308 } // namespace exo 308 } // namespace exo
309 309
310 #endif // COMPONENTS_EXO_SHELL_SURFACE_H_ 310 #endif // COMPONENTS_EXO_SHELL_SURFACE_H_
OLDNEW
« no previous file with comments | « components/exo/pointer_unittest.cc ('k') | components/exo/shell_surface.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698