| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 CHROME_BROWSER_UI_VIEWS_APPS_CHROME_NATIVE_APP_WINDOW_VIEWS_H_ | 5 #ifndef CHROME_BROWSER_UI_VIEWS_APPS_CHROME_NATIVE_APP_WINDOW_VIEWS_H_ |
| 6 #define CHROME_BROWSER_UI_VIEWS_APPS_CHROME_NATIVE_APP_WINDOW_VIEWS_H_ | 6 #define CHROME_BROWSER_UI_VIEWS_APPS_CHROME_NATIVE_APP_WINDOW_VIEWS_H_ |
| 7 | 7 |
| 8 #include "base/macros.h" |
| 8 #include "base/memory/scoped_ptr.h" | 9 #include "base/memory/scoped_ptr.h" |
| 9 #include "extensions/components/native_app_window/native_app_window_views.h" | 10 #include "extensions/components/native_app_window/native_app_window_views.h" |
| 10 | 11 |
| 11 namespace apps { | 12 namespace apps { |
| 12 class AppWindowFrameView; | 13 class AppWindowFrameView; |
| 13 } | 14 } |
| 14 | 15 |
| 15 class ExtensionKeybindingRegistryViews; | 16 class ExtensionKeybindingRegistryViews; |
| 16 | 17 |
| 17 class ChromeNativeAppWindowViews | 18 class ChromeNativeAppWindowViews |
| (...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 82 SkColor inactive_frame_color_; | 83 SkColor inactive_frame_color_; |
| 83 gfx::Size preferred_size_; | 84 gfx::Size preferred_size_; |
| 84 | 85 |
| 85 // The class that registers for keyboard shortcuts for extension commands. | 86 // The class that registers for keyboard shortcuts for extension commands. |
| 86 scoped_ptr<ExtensionKeybindingRegistryViews> extension_keybinding_registry_; | 87 scoped_ptr<ExtensionKeybindingRegistryViews> extension_keybinding_registry_; |
| 87 | 88 |
| 88 DISALLOW_COPY_AND_ASSIGN(ChromeNativeAppWindowViews); | 89 DISALLOW_COPY_AND_ASSIGN(ChromeNativeAppWindowViews); |
| 89 }; | 90 }; |
| 90 | 91 |
| 91 #endif // CHROME_BROWSER_UI_VIEWS_APPS_CHROME_NATIVE_APP_WINDOW_VIEWS_H_ | 92 #endif // CHROME_BROWSER_UI_VIEWS_APPS_CHROME_NATIVE_APP_WINDOW_VIEWS_H_ |
| OLD | NEW |