| 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 486 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 497 ash::PanelFrameView::FRAME_NONE : ash::PanelFrameView::FRAME_ASH; | 497 ash::PanelFrameView::FRAME_NONE : ash::PanelFrameView::FRAME_ASH; |
| 498 views::NonClientFrameView* frame_view = | 498 views::NonClientFrameView* frame_view = |
| 499 new ash::PanelFrameView(widget, frame_type); | 499 new ash::PanelFrameView(widget, frame_type); |
| 500 frame_view->set_context_menu_controller(this); | 500 frame_view->set_context_menu_controller(this); |
| 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) | |
| 508 // Non-frameless app windows can be put into immersive fullscreen. | 507 // Non-frameless app windows can be put into immersive fullscreen. |
| 509 // TODO(pkotwicz): Investigate if immersive fullscreen can be enabled for | |
| 510 // Windows Ash. | |
| 511 if (ash::switches::UseImmersiveFullscreenForAllWindows()) { | 508 if (ash::switches::UseImmersiveFullscreenForAllWindows()) { |
| 512 immersive_fullscreen_controller_.reset( | 509 immersive_fullscreen_controller_.reset( |
| 513 new ash::ImmersiveFullscreenController()); | 510 new ash::ImmersiveFullscreenController()); |
| 514 custom_frame_view->InitImmersiveFullscreenControllerForView( | 511 custom_frame_view->InitImmersiveFullscreenControllerForView( |
| 515 immersive_fullscreen_controller_.get()); | 512 immersive_fullscreen_controller_.get()); |
| 516 } | 513 } |
| 517 #endif | |
| 518 custom_frame_view->GetHeaderView()->set_context_menu_controller(this); | 514 custom_frame_view->GetHeaderView()->set_context_menu_controller(this); |
| 519 return custom_frame_view; | 515 return custom_frame_view; |
| 520 } | 516 } |
| 521 } | 517 } |
| 522 #endif | 518 #endif |
| 523 if (!ShouldUseNativeFrame()) | 519 if (!ShouldUseNativeFrame()) |
| 524 return CreateAppWindowFrameView(); | 520 return CreateAppWindowFrameView(); |
| 525 return views::WidgetDelegateView::CreateNonClientFrameView(widget); | 521 return views::WidgetDelegateView::CreateNonClientFrameView(widget); |
| 526 } | 522 } |
| 527 | 523 |
| (...skipping 151 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 679 NULL)); | 675 NULL)); |
| 680 | 676 |
| 681 #if defined(OS_WIN) | 677 #if defined(OS_WIN) |
| 682 if (!ShouldUseNativeFrame() && | 678 if (!ShouldUseNativeFrame() && |
| 683 chrome::GetHostDesktopTypeForNativeWindow(window()->GetNativeWindow()) != | 679 chrome::GetHostDesktopTypeForNativeWindow(window()->GetNativeWindow()) != |
| 684 chrome::HOST_DESKTOP_TYPE_ASH) { | 680 chrome::HOST_DESKTOP_TYPE_ASH) { |
| 685 InstallEasyResizeTargeterOnContainer(); | 681 InstallEasyResizeTargeterOnContainer(); |
| 686 } | 682 } |
| 687 #endif | 683 #endif |
| 688 } | 684 } |
| OLD | NEW |