| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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_NATIVE_APP_WINDOW_VIEWS_H_ | 5 #ifndef CHROME_BROWSER_UI_VIEWS_APPS_NATIVE_APP_WINDOW_VIEWS_H_ |
| 6 #define CHROME_BROWSER_UI_VIEWS_APPS_NATIVE_APP_WINDOW_VIEWS_H_ | 6 #define CHROME_BROWSER_UI_VIEWS_APPS_NATIVE_APP_WINDOW_VIEWS_H_ |
| 7 | 7 |
| 8 #include "apps/native_app_window.h" | 8 #include "apps/native_app_window.h" |
| 9 #include "apps/shell_window.h" | 9 #include "apps/shell_window.h" |
| 10 #include "base/observer_list.h" | 10 #include "base/observer_list.h" |
| (...skipping 18 matching lines...) Expand all Loading... |
| 29 } | 29 } |
| 30 | 30 |
| 31 namespace extensions { | 31 namespace extensions { |
| 32 class Extension; | 32 class Extension; |
| 33 } | 33 } |
| 34 | 34 |
| 35 namespace views { | 35 namespace views { |
| 36 class WebView; | 36 class WebView; |
| 37 } | 37 } |
| 38 | 38 |
| 39 #if defined(USE_ASH) |
| 40 class NonClientFrameViewSwitcherAsh; |
| 41 #endif |
| 42 |
| 39 class NativeAppWindowViews : public apps::NativeAppWindow, | 43 class NativeAppWindowViews : public apps::NativeAppWindow, |
| 40 public views::WidgetDelegateView, | 44 public views::WidgetDelegateView, |
| 41 public views::WidgetObserver, | 45 public views::WidgetObserver, |
| 42 public content::WebContentsObserver { | 46 public content::WebContentsObserver { |
| 43 public: | 47 public: |
| 44 NativeAppWindowViews(apps::ShellWindow* shell_window, | 48 NativeAppWindowViews(apps::ShellWindow* shell_window, |
| 45 const apps::ShellWindow::CreateParams& params); | 49 const apps::ShellWindow::CreateParams& params); |
| 46 virtual ~NativeAppWindowViews(); | 50 virtual ~NativeAppWindowViews(); |
| 47 | 51 |
| 48 bool frameless() const { return frameless_; } | 52 bool frameless() const { return frameless_; } |
| (...skipping 129 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 178 gfx::Size minimum_size_; | 182 gfx::Size minimum_size_; |
| 179 gfx::Size maximum_size_; | 183 gfx::Size maximum_size_; |
| 180 gfx::Size preferred_size_; | 184 gfx::Size preferred_size_; |
| 181 bool resizable_; | 185 bool resizable_; |
| 182 | 186 |
| 183 // The class that registers for keyboard shortcuts for extension commands. | 187 // The class that registers for keyboard shortcuts for extension commands. |
| 184 scoped_ptr<ExtensionKeybindingRegistryViews> extension_keybinding_registry_; | 188 scoped_ptr<ExtensionKeybindingRegistryViews> extension_keybinding_registry_; |
| 185 | 189 |
| 186 views::UnhandledKeyboardEventHandler unhandled_keyboard_event_handler_; | 190 views::UnhandledKeyboardEventHandler unhandled_keyboard_event_handler_; |
| 187 | 191 |
| 192 #if defined(USE_ASH) |
| 193 // Used to switch the non client frame view when an app's maximized state is |
| 194 // changed. |
| 195 scoped_ptr<NonClientFrameViewSwitcherAsh> frame_switcher_; |
| 196 #endif |
| 197 |
| 188 base::WeakPtrFactory<NativeAppWindowViews> weak_ptr_factory_; | 198 base::WeakPtrFactory<NativeAppWindowViews> weak_ptr_factory_; |
| 189 | 199 |
| 190 ObserverList<web_modal::WebContentsModalDialogHostObserver> observer_list_; | 200 ObserverList<web_modal::WebContentsModalDialogHostObserver> observer_list_; |
| 191 | 201 |
| 192 DISALLOW_COPY_AND_ASSIGN(NativeAppWindowViews); | 202 DISALLOW_COPY_AND_ASSIGN(NativeAppWindowViews); |
| 193 }; | 203 }; |
| 194 | 204 |
| 195 #endif // CHROME_BROWSER_UI_VIEWS_APPS_NATIVE_APP_WINDOW_VIEWS_H_ | 205 #endif // CHROME_BROWSER_UI_VIEWS_APPS_NATIVE_APP_WINDOW_VIEWS_H_ |
| OLD | NEW |