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 "ash/wm/immersive_fullscreen_controller.h" | 5 #include "ash/wm/immersive_fullscreen_controller.h" |
6 | 6 |
7 #include "ash/display/display_manager.h" | 7 #include "ash/display/display_manager.h" |
8 #include "ash/root_window_controller.h" | 8 #include "ash/root_window_controller.h" |
9 #include "ash/screen_ash.h" | 9 #include "ash/screen_ash.h" |
10 #include "ash/shelf/shelf_layout_manager.h" | 10 #include "ash/shelf/shelf_layout_manager.h" |
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
47 virtual void OnImmersiveRevealEnded() OVERRIDE { | 47 virtual void OnImmersiveRevealEnded() OVERRIDE { |
48 visible_fraction_ = 0; | 48 visible_fraction_ = 0; |
49 } | 49 } |
50 virtual void OnImmersiveFullscreenExited() OVERRIDE { | 50 virtual void OnImmersiveFullscreenExited() OVERRIDE { |
51 enabled_ = false; | 51 enabled_ = false; |
52 visible_fraction_ = 1; | 52 visible_fraction_ = 1; |
53 } | 53 } |
54 virtual void SetVisibleFraction(double visible_fraction) OVERRIDE { | 54 virtual void SetVisibleFraction(double visible_fraction) OVERRIDE { |
55 visible_fraction_ = visible_fraction; | 55 visible_fraction_ = visible_fraction; |
56 } | 56 } |
57 virtual std::vector<gfx::Rect> GetVisibleBoundsInScreen() OVERRIDE { | 57 virtual std::vector<gfx::Rect> GetVisibleBoundsInScreen() const OVERRIDE { |
58 std::vector<gfx::Rect> bounds_in_screen; | 58 std::vector<gfx::Rect> bounds_in_screen; |
59 bounds_in_screen.push_back(top_container_view_->GetBoundsInScreen()); | 59 bounds_in_screen.push_back(top_container_view_->GetBoundsInScreen()); |
60 return bounds_in_screen; | 60 return bounds_in_screen; |
61 } | 61 } |
62 | 62 |
63 bool is_enabled() const { | 63 bool is_enabled() const { |
64 return enabled_; | 64 return enabled_; |
65 } | 65 } |
66 | 66 |
67 double visible_fraction() const { | 67 double visible_fraction() const { |
(...skipping 822 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
890 // Disabling immersive fullscreen maintains the user's auto-hide selection. | 890 // Disabling immersive fullscreen maintains the user's auto-hide selection. |
891 controller()->SetEnabled(false); | 891 controller()->SetEnabled(false); |
892 window()->SetProperty(aura::client::kShowStateKey, | 892 window()->SetProperty(aura::client::kShowStateKey, |
893 ui::SHOW_STATE_NORMAL); | 893 ui::SHOW_STATE_NORMAL); |
894 EXPECT_EQ(ash::SHELF_AUTO_HIDE, shelf->visibility_state()); | 894 EXPECT_EQ(ash::SHELF_AUTO_HIDE, shelf->visibility_state()); |
895 } | 895 } |
896 | 896 |
897 } // namespase ash | 897 } // namespase ash |
898 | 898 |
899 #endif // defined(OS_CHROMEOS) | 899 #endif // defined(OS_CHROMEOS) |
OLD | NEW |