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 #include "chrome/browser/ui/views/apps/chrome_native_app_window_views.h" | 5 #include "chrome/browser/ui/views/apps/chrome_native_app_window_views.h" |
6 | 6 |
7 #include <stddef.h> | 7 #include <stddef.h> |
8 #include <utility> | 8 #include <utility> |
9 | 9 |
10 #include "apps/ui/views/app_window_frame_view.h" | 10 #include "apps/ui/views/app_window_frame_view.h" |
11 #include "base/macros.h" | 11 #include "base/macros.h" |
| 12 #include "base/memory/ptr_util.h" |
12 #include "build/build_config.h" | 13 #include "build/build_config.h" |
13 #include "chrome/app/chrome_command_ids.h" | 14 #include "chrome/app/chrome_command_ids.h" |
14 #include "chrome/browser/app_mode/app_mode_utils.h" | 15 #include "chrome/browser/app_mode/app_mode_utils.h" |
15 #include "chrome/browser/profiles/profile.h" | 16 #include "chrome/browser/profiles/profile.h" |
16 #include "chrome/browser/ui/views/extensions/extension_keybinding_registry_views
.h" | 17 #include "chrome/browser/ui/views/extensions/extension_keybinding_registry_views
.h" |
17 #include "components/favicon/content/content_favicon_driver.h" | 18 #include "components/favicon/content/content_favicon_driver.h" |
18 #include "components/zoom/page_zoom.h" | 19 #include "components/zoom/page_zoom.h" |
19 #include "components/zoom/zoom_controller.h" | 20 #include "components/zoom/zoom_controller.h" |
20 #include "ui/views/controls/webview/webview.h" | 21 #include "ui/views/controls/webview/webview.h" |
21 #include "ui/views/widget/widget.h" | 22 #include "ui/views/widget/widget.h" |
(...skipping 351 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
373 InitializePanelWindow(create_params); | 374 InitializePanelWindow(create_params); |
374 } else { | 375 } else { |
375 InitializeDefaultWindow(create_params); | 376 InitializeDefaultWindow(create_params); |
376 } | 377 } |
377 extension_keybinding_registry_.reset(new ExtensionKeybindingRegistryViews( | 378 extension_keybinding_registry_.reset(new ExtensionKeybindingRegistryViews( |
378 Profile::FromBrowserContext(app_window->browser_context()), | 379 Profile::FromBrowserContext(app_window->browser_context()), |
379 widget()->GetFocusManager(), | 380 widget()->GetFocusManager(), |
380 extensions::ExtensionKeybindingRegistry::PLATFORM_APPS_ONLY, | 381 extensions::ExtensionKeybindingRegistry::PLATFORM_APPS_ONLY, |
381 NULL)); | 382 NULL)); |
382 } | 383 } |
OLD | NEW |