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

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

Issue 2480713003: Window prerequisites for ShelfWindowWatcher panel support. (Closed)
Patch Set: Fix ShellSurface KAppIdKey use; remove local application_id_. Created 4 years, 1 month 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 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 106 matching lines...) Expand 10 before | Expand all | Expand 10 after
117 void SetPinned(bool pinned, bool trusted); 117 void SetPinned(bool pinned, bool trusted);
118 118
119 // Set title for surface. 119 // Set title for surface.
120 void SetTitle(const base::string16& title); 120 void SetTitle(const base::string16& title);
121 121
122 // Sets the system modality. 122 // Sets the system modality.
123 void SetSystemModal(bool system_modal); 123 void SetSystemModal(bool system_modal);
124 124
125 // Sets the application ID for the window. The application ID identifies the 125 // Sets the application ID for the window. The application ID identifies the
126 // general class of applications to which the window belongs. 126 // general class of applications to which the window belongs.
127 static void SetApplicationId(aura::Window* window, 127 static void SetApplicationId(aura::Window* window, const std::string& id);
128 std::string* application_id);
129 static const std::string GetApplicationId(aura::Window* window); 128 static const std::string GetApplicationId(aura::Window* window);
130 129
131 // Set application id for surface.
132 void SetApplicationId(const std::string& application_id);
reveman 2016/11/05 01:25:52 nit: can you keep this non-static function around?
msw 2016/11/05 23:12:08 Done.
133
134 // Start an interactive move of surface. 130 // Start an interactive move of surface.
135 void Move(); 131 void Move();
136 132
137 // Start an interactive resize of surface. |component| is one of the windows 133 // Start an interactive resize of surface. |component| is one of the windows
138 // HT constants (see ui/base/hit_test.h) and describes in what direction the 134 // HT constants (see ui/base/hit_test.h) and describes in what direction the
139 // surface should be resized. 135 // surface should be resized.
140 void Resize(int component); 136 void Resize(int component);
141 137
142 // Signal a request to close the window. It is up to the implementation to 138 // Signal a request to close the window. It is up to the implementation to
143 // actually decide to do so though. 139 // actually decide to do so though.
(...skipping 124 matching lines...) Expand 10 before | Expand all | Expand 10 after
268 264
269 views::Widget* widget_ = nullptr; 265 views::Widget* widget_ = nullptr;
270 Surface* surface_; 266 Surface* surface_;
271 aura::Window* parent_; 267 aura::Window* parent_;
272 const gfx::Rect initial_bounds_; 268 const gfx::Rect initial_bounds_;
273 const bool activatable_; 269 const bool activatable_;
274 // Container Window Id (see ash/public/cpp/shell_window_ids.h) 270 // Container Window Id (see ash/public/cpp/shell_window_ids.h)
275 const int container_; 271 const int container_;
276 bool pending_show_widget_ = false; 272 bool pending_show_widget_ = false;
277 base::string16 title_; 273 base::string16 title_;
278 std::string application_id_;
279 gfx::Rect geometry_; 274 gfx::Rect geometry_;
280 gfx::Rect pending_geometry_; 275 gfx::Rect pending_geometry_;
281 double scale_ = 1.0; 276 double scale_ = 1.0;
282 double pending_scale_ = 1.0; 277 double pending_scale_ = 1.0;
283 base::Closure close_callback_; 278 base::Closure close_callback_;
284 base::Closure surface_destroyed_callback_; 279 base::Closure surface_destroyed_callback_;
285 StateChangedCallback state_changed_callback_; 280 StateChangedCallback state_changed_callback_;
286 ConfigureCallback configure_callback_; 281 ConfigureCallback configure_callback_;
287 ScopedConfigure* scoped_configure_ = nullptr; 282 ScopedConfigure* scoped_configure_ = nullptr;
288 bool ignore_window_bounds_changes_ = false; 283 bool ignore_window_bounds_changes_ = false;
(...skipping 12 matching lines...) Expand all
301 int top_inset_height_ = 0; 296 int top_inset_height_ = 0;
302 int pending_top_inset_height_ = 0; 297 int pending_top_inset_height_ = 0;
303 float rectangular_shadow_background_opacity_ = 1.0; 298 float rectangular_shadow_background_opacity_ = 1.0;
304 299
305 DISALLOW_COPY_AND_ASSIGN(ShellSurface); 300 DISALLOW_COPY_AND_ASSIGN(ShellSurface);
306 }; 301 };
307 302
308 } // namespace exo 303 } // namespace exo
309 304
310 #endif // COMPONENTS_EXO_SHELL_SURFACE_H_ 305 #endif // COMPONENTS_EXO_SHELL_SURFACE_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/ash/launcher/launcher_context_menu_unittest.cc ('k') | components/exo/shell_surface.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698