| 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 #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 <string> | 8 #include <string> |
| 9 | 9 |
| 10 #include "base/macros.h" | 10 #include "base/macros.h" |
| 11 #include "base/memory/scoped_ptr.h" | 11 #include "base/memory/scoped_ptr.h" |
| 12 #include "base/strings/string16.h" | 12 #include "base/strings/string16.h" |
| 13 #include "components/exo/surface_delegate.h" | 13 #include "components/exo/surface_delegate.h" |
| 14 #include "components/exo/surface_observer.h" | 14 #include "components/exo/surface_observer.h" |
| 15 #include "ui/views/controls/button/button.h" |
| 15 #include "ui/views/widget/widget_delegate.h" | 16 #include "ui/views/widget/widget_delegate.h" |
| 16 | 17 |
| 17 namespace base { | 18 namespace base { |
| 18 namespace trace_event { | 19 namespace trace_event { |
| 19 class TracedValue; | 20 class TracedValue; |
| 20 } | 21 } |
| 21 } | 22 } |
| 22 | 23 |
| 23 namespace exo { | 24 namespace exo { |
| 24 class Surface; | 25 class Surface; |
| (...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 68 Surface* surface_; | 69 Surface* surface_; |
| 69 ui::WindowShowState show_state_; | 70 ui::WindowShowState show_state_; |
| 70 base::string16 title_; | 71 base::string16 title_; |
| 71 | 72 |
| 72 DISALLOW_COPY_AND_ASSIGN(ShellSurface); | 73 DISALLOW_COPY_AND_ASSIGN(ShellSurface); |
| 73 }; | 74 }; |
| 74 | 75 |
| 75 } // namespace exo | 76 } // namespace exo |
| 76 | 77 |
| 77 #endif // COMPONENTS_EXO_SHELL_SURFACE_H_ | 78 #endif // COMPONENTS_EXO_SHELL_SURFACE_H_ |
| OLD | NEW |