| Index: components/mus/ws/server_window.h
|
| diff --git a/components/mus/ws/server_window.h b/components/mus/ws/server_window.h
|
| index 0fa7810c91f057c28f54a545a40d4cf32038fd4e..614c0827467917ec7b032e07ddbfe13f2324a236 100644
|
| --- a/components/mus/ws/server_window.h
|
| +++ b/components/mus/ws/server_window.h
|
| @@ -15,12 +15,12 @@
|
| #include "components/mus/ws/ids.h"
|
| #include "components/mus/ws/server_window_surface.h"
|
| #include "third_party/mojo/src/mojo/public/cpp/bindings/binding.h"
|
| +#include "ui/gfx/geometry/insets.h"
|
| #include "ui/gfx/geometry/rect.h"
|
| #include "ui/gfx/transform.h"
|
| #include "ui/platform_window/text_input_state.h"
|
|
|
| namespace mus {
|
| -
|
| namespace ws {
|
|
|
| class ServerWindowDelegate;
|
| @@ -66,8 +66,8 @@ class ServerWindow {
|
| // area to fill the whole bounds.
|
| void SetBounds(const gfx::Rect& bounds);
|
|
|
| - const gfx::Rect& client_area() const { return client_area_; }
|
| - void SetClientArea(const gfx::Rect& bounds);
|
| + const gfx::Insets& client_area() const { return client_area_; }
|
| + void SetClientArea(const gfx::Insets& insets);
|
|
|
| const ServerWindow* parent() const { return parent_; }
|
| ServerWindow* parent() { return parent_; }
|
| @@ -137,7 +137,7 @@ class ServerWindow {
|
| Windows children_;
|
| bool visible_;
|
| gfx::Rect bounds_;
|
| - gfx::Rect client_area_;
|
| + gfx::Insets client_area_;
|
| scoped_ptr<ServerWindowSurfaceManager> surface_manager_;
|
| float opacity_;
|
| gfx::Transform transform_;
|
| @@ -151,7 +151,6 @@ class ServerWindow {
|
| };
|
|
|
| } // namespace ws
|
| -
|
| } // namespace mus
|
|
|
| #endif // COMPONENTS_MUS_WS_SERVER_WINDOW_H_
|
|
|