OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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/native_app_window_views.h" | 5 #include "chrome/browser/ui/views/apps/native_app_window_views.h" |
6 | 6 |
7 #include "apps/shell_window.h" | 7 #include "apps/shell_window.h" |
8 #include "apps/ui/views/shell_window_frame_view.h" | 8 #include "apps/ui/views/shell_window_frame_view.h" |
9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
10 #include "base/file_util.h" | 10 #include "base/file_util.h" |
(...skipping 710 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
721 return frame_view; | 721 return frame_view; |
722 } | 722 } |
723 | 723 |
724 if (!frameless_) { | 724 if (!frameless_) { |
725 ash::CustomFrameViewAsh* custom_frame_view = | 725 ash::CustomFrameViewAsh* custom_frame_view = |
726 new ash::CustomFrameViewAsh(widget); | 726 new ash::CustomFrameViewAsh(widget); |
727 #if defined(OS_CHROMEOS) | 727 #if defined(OS_CHROMEOS) |
728 // Non-frameless app windows can be put into immersive fullscreen. | 728 // Non-frameless app windows can be put into immersive fullscreen. |
729 // TODO(pkotwicz): Investigate if immersive fullscreen can be enabled for | 729 // TODO(pkotwicz): Investigate if immersive fullscreen can be enabled for |
730 // Windows Ash. | 730 // Windows Ash. |
731 if (CommandLine::ForCurrentProcess()->HasSwitch( | 731 if (ash::switches::UseImmersiveFullscreenForAllWindows()) { |
732 ash::switches::kAshEnableImmersiveFullscreenForAllWindows)) { | |
733 immersive_fullscreen_controller_.reset( | 732 immersive_fullscreen_controller_.reset( |
734 new ash::ImmersiveFullscreenController()); | 733 new ash::ImmersiveFullscreenController()); |
735 custom_frame_view->InitImmersiveFullscreenControllerForView( | 734 custom_frame_view->InitImmersiveFullscreenControllerForView( |
736 immersive_fullscreen_controller_.get()); | 735 immersive_fullscreen_controller_.get()); |
737 } | 736 } |
738 #endif | 737 #endif |
739 custom_frame_view->GetHeaderView()->set_context_menu_controller(this); | 738 custom_frame_view->GetHeaderView()->set_context_menu_controller(this); |
740 return custom_frame_view; | 739 return custom_frame_view; |
741 } | 740 } |
742 } | 741 } |
(...skipping 217 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
960 gfx::Rect client_bounds = gfx::Rect(1000, 1000); | 959 gfx::Rect client_bounds = gfx::Rect(1000, 1000); |
961 gfx::Rect window_bounds = | 960 gfx::Rect window_bounds = |
962 window_->non_client_view()->GetWindowBoundsForClientBounds( | 961 window_->non_client_view()->GetWindowBoundsForClientBounds( |
963 client_bounds); | 962 client_bounds); |
964 return window_bounds.InsetsFrom(client_bounds); | 963 return window_bounds.InsetsFrom(client_bounds); |
965 } | 964 } |
966 | 965 |
967 void NativeAppWindowViews::HideWithApp() {} | 966 void NativeAppWindowViews::HideWithApp() {} |
968 void NativeAppWindowViews::ShowWithApp() {} | 967 void NativeAppWindowViews::ShowWithApp() {} |
969 void NativeAppWindowViews::UpdateWindowMinMaxSize() {} | 968 void NativeAppWindowViews::UpdateWindowMinMaxSize() {} |
OLD | NEW |