OLD | NEW |
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 #include "components/exo/shell_surface.h" | 5 #include "components/exo/shell_surface.h" |
6 | 6 |
7 #include "ash/shell.h" | 7 #include "ash/shell.h" |
8 #include "ash/shell_window_ids.h" | 8 #include "ash/shell_window_ids.h" |
9 #include "ash/wm/window_state.h" | 9 #include "ash/wm/window_state.h" |
10 #include "base/logging.h" | 10 #include "base/logging.h" |
| 11 #include "base/macros.h" |
11 #include "base/strings/utf_string_conversions.h" | 12 #include "base/strings/utf_string_conversions.h" |
12 #include "base/trace_event/trace_event.h" | 13 #include "base/trace_event/trace_event.h" |
13 #include "base/trace_event/trace_event_argument.h" | 14 #include "base/trace_event/trace_event_argument.h" |
14 #include "components/exo/surface.h" | 15 #include "components/exo/surface.h" |
15 #include "ui/aura/window.h" | 16 #include "ui/aura/window.h" |
16 #include "ui/aura/window_property.h" | 17 #include "ui/aura/window_property.h" |
17 #include "ui/base/hit_test.h" | 18 #include "ui/base/hit_test.h" |
18 #include "ui/views/widget/widget.h" | 19 #include "ui/views/widget/widget.h" |
19 | 20 |
20 DECLARE_WINDOW_PROPERTY_TYPE(std::string*) | 21 DECLARE_WINDOW_PROPERTY_TYPE(std::string*) |
(...skipping 240 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
261 // views::Views overrides: | 262 // views::Views overrides: |
262 | 263 |
263 gfx::Size ShellSurface::GetPreferredSize() const { | 264 gfx::Size ShellSurface::GetPreferredSize() const { |
264 if (!geometry_.IsEmpty()) | 265 if (!geometry_.IsEmpty()) |
265 return geometry_.size(); | 266 return geometry_.size(); |
266 | 267 |
267 return surface_ ? surface_->GetPreferredSize() : gfx::Size(); | 268 return surface_ ? surface_->GetPreferredSize() : gfx::Size(); |
268 } | 269 } |
269 | 270 |
270 } // namespace exo | 271 } // namespace exo |
OLD | NEW |