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 "base/command_line.h" | 8 #include "base/command_line.h" |
9 #include "chrome/app/chrome_command_ids.h" | 9 #include "chrome/app/chrome_command_ids.h" |
10 #include "chrome/browser/app_mode/app_mode_utils.h" | 10 #include "chrome/browser/app_mode/app_mode_utils.h" |
(...skipping 490 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
501 return frame_view; | 501 return frame_view; |
502 } | 502 } |
503 | 503 |
504 if (!IsFrameless()) { | 504 if (!IsFrameless()) { |
505 ash::CustomFrameViewAsh* custom_frame_view = | 505 ash::CustomFrameViewAsh* custom_frame_view = |
506 new ash::CustomFrameViewAsh(widget); | 506 new ash::CustomFrameViewAsh(widget); |
507 #if defined(OS_CHROMEOS) | 507 #if defined(OS_CHROMEOS) |
508 // Non-frameless app windows can be put into immersive fullscreen. | 508 // Non-frameless app windows can be put into immersive fullscreen. |
509 // TODO(pkotwicz): Investigate if immersive fullscreen can be enabled for | 509 // TODO(pkotwicz): Investigate if immersive fullscreen can be enabled for |
510 // Windows Ash. | 510 // Windows Ash. |
511 if (ash::switches::UseImmersiveFullscreenForAllWindows()) { | 511 immersive_fullscreen_controller_.reset( |
512 immersive_fullscreen_controller_.reset( | 512 new ash::ImmersiveFullscreenController()); |
513 new ash::ImmersiveFullscreenController()); | 513 custom_frame_view->InitImmersiveFullscreenControllerForView( |
514 custom_frame_view->InitImmersiveFullscreenControllerForView( | 514 immersive_fullscreen_controller_.get()); |
515 immersive_fullscreen_controller_.get()); | |
516 } | |
517 #endif | 515 #endif |
518 custom_frame_view->GetHeaderView()->set_context_menu_controller(this); | 516 custom_frame_view->GetHeaderView()->set_context_menu_controller(this); |
519 return custom_frame_view; | 517 return custom_frame_view; |
520 } | 518 } |
521 } | 519 } |
522 #endif | 520 #endif |
523 if (!ShouldUseNativeFrame()) | 521 if (!ShouldUseNativeFrame()) |
524 return CreateAppWindowFrameView(); | 522 return CreateAppWindowFrameView(); |
525 return views::WidgetDelegateView::CreateNonClientFrameView(widget); | 523 return views::WidgetDelegateView::CreateNonClientFrameView(widget); |
526 } | 524 } |
(...skipping 152 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
679 NULL)); | 677 NULL)); |
680 | 678 |
681 #if defined(OS_WIN) | 679 #if defined(OS_WIN) |
682 if (!ShouldUseNativeFrame() && | 680 if (!ShouldUseNativeFrame() && |
683 chrome::GetHostDesktopTypeForNativeWindow(window()->GetNativeWindow()) != | 681 chrome::GetHostDesktopTypeForNativeWindow(window()->GetNativeWindow()) != |
684 chrome::HOST_DESKTOP_TYPE_ASH) { | 682 chrome::HOST_DESKTOP_TYPE_ASH) { |
685 InstallEasyResizeTargeterOnContainer(); | 683 InstallEasyResizeTargeterOnContainer(); |
686 } | 684 } |
687 #endif | 685 #endif |
688 } | 686 } |
OLD | NEW |