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" |
(...skipping 342 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
353 | 353 |
354 // NativeAppWindowViews implementation. | 354 // NativeAppWindowViews implementation. |
355 | 355 |
356 void ChromeNativeAppWindowViews::InitializeWindow( | 356 void ChromeNativeAppWindowViews::InitializeWindow( |
357 AppWindow* app_window, | 357 AppWindow* app_window, |
358 const AppWindow::CreateParams& create_params) { | 358 const AppWindow::CreateParams& create_params) { |
359 DCHECK(widget()); | 359 DCHECK(widget()); |
360 has_frame_color_ = create_params.has_frame_color; | 360 has_frame_color_ = create_params.has_frame_color; |
361 active_frame_color_ = create_params.active_frame_color; | 361 active_frame_color_ = create_params.active_frame_color; |
362 inactive_frame_color_ = create_params.inactive_frame_color; | 362 inactive_frame_color_ = create_params.inactive_frame_color; |
363 if (create_params.window_type == AppWindow::WINDOW_TYPE_PANEL || | 363 if (create_params.window_type == AppWindow::WINDOW_TYPE_PANEL) { |
364 create_params.window_type == AppWindow::WINDOW_TYPE_V1_PANEL) { | |
365 InitializePanelWindow(create_params); | 364 InitializePanelWindow(create_params); |
366 } else { | 365 } else { |
367 InitializeDefaultWindow(create_params); | 366 InitializeDefaultWindow(create_params); |
368 } | 367 } |
369 extension_keybinding_registry_.reset(new ExtensionKeybindingRegistryViews( | 368 extension_keybinding_registry_.reset(new ExtensionKeybindingRegistryViews( |
370 Profile::FromBrowserContext(app_window->browser_context()), | 369 Profile::FromBrowserContext(app_window->browser_context()), |
371 widget()->GetFocusManager(), | 370 widget()->GetFocusManager(), |
372 extensions::ExtensionKeybindingRegistry::PLATFORM_APPS_ONLY, | 371 extensions::ExtensionKeybindingRegistry::PLATFORM_APPS_ONLY, |
373 NULL)); | 372 NULL)); |
374 } | 373 } |
OLD | NEW |