| 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 "apps/ui/views/app_window_frame_view.h" | 7 #include "apps/ui/views/app_window_frame_view.h" |
| 8 #include "chrome/app/chrome_command_ids.h" | 8 #include "chrome/app/chrome_command_ids.h" |
| 9 #include "chrome/browser/app_mode/app_mode_utils.h" | 9 #include "chrome/browser/app_mode/app_mode_utils.h" |
| 10 #include "chrome/browser/profiles/profile.h" | 10 #include "chrome/browser/profiles/profile.h" |
| (...skipping 203 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 214 OnBeforePanelWidgetInit(¶ms, widget()); | 214 OnBeforePanelWidgetInit(¶ms, widget()); |
| 215 widget()->Init(params); | 215 widget()->Init(params); |
| 216 widget()->set_focus_on_creation(create_params.focused); | 216 widget()->set_focus_on_creation(create_params.focused); |
| 217 } | 217 } |
| 218 | 218 |
| 219 views::NonClientFrameView* | 219 views::NonClientFrameView* |
| 220 ChromeNativeAppWindowViews::CreateStandardDesktopAppFrame() { | 220 ChromeNativeAppWindowViews::CreateStandardDesktopAppFrame() { |
| 221 return views::WidgetDelegateView::CreateNonClientFrameView(widget()); | 221 return views::WidgetDelegateView::CreateNonClientFrameView(widget()); |
| 222 } | 222 } |
| 223 | 223 |
| 224 apps::AppWindowFrameView* | 224 views::NonClientFrameView* |
| 225 ChromeNativeAppWindowViews::CreateNonStandardAppFrame() { | 225 ChromeNativeAppWindowViews::CreateNonStandardAppFrame() { |
| 226 apps::AppWindowFrameView* frame = | 226 apps::AppWindowFrameView* frame = |
| 227 new apps::AppWindowFrameView(widget(), this, has_frame_color_, | 227 new apps::AppWindowFrameView(widget(), this, has_frame_color_, |
| 228 active_frame_color_, inactive_frame_color_); | 228 active_frame_color_, inactive_frame_color_); |
| 229 frame->Init(); | 229 frame->Init(); |
| 230 return frame; | 230 return frame; |
| 231 } | 231 } |
| 232 | 232 |
| 233 // ui::BaseWindow implementation. | 233 // ui::BaseWindow implementation. |
| 234 | 234 |
| (...skipping 163 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 398 InitializePanelWindow(create_params); | 398 InitializePanelWindow(create_params); |
| 399 } else { | 399 } else { |
| 400 InitializeDefaultWindow(create_params); | 400 InitializeDefaultWindow(create_params); |
| 401 } | 401 } |
| 402 extension_keybinding_registry_.reset(new ExtensionKeybindingRegistryViews( | 402 extension_keybinding_registry_.reset(new ExtensionKeybindingRegistryViews( |
| 403 Profile::FromBrowserContext(app_window->browser_context()), | 403 Profile::FromBrowserContext(app_window->browser_context()), |
| 404 widget()->GetFocusManager(), | 404 widget()->GetFocusManager(), |
| 405 extensions::ExtensionKeybindingRegistry::PLATFORM_APPS_ONLY, | 405 extensions::ExtensionKeybindingRegistry::PLATFORM_APPS_ONLY, |
| 406 NULL)); | 406 NULL)); |
| 407 } | 407 } |
| OLD | NEW |