| 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 #ifndef ATHENA_WM_SPLIT_VIEW_CONTROLLER_H_ | 5 #ifndef ATHENA_WM_SPLIT_VIEW_CONTROLLER_H_ |
| 6 #define ATHENA_WM_SPLIT_VIEW_CONTROLLER_H_ | 6 #define ATHENA_WM_SPLIT_VIEW_CONTROLLER_H_ |
| 7 | 7 |
| 8 #include "athena/athena_export.h" | 8 #include "athena/athena_export.h" |
| 9 #include "athena/wm/bezel_controller.h" | 9 #include "athena/wm/bezel_controller.h" |
| 10 #include "base/memory/scoped_ptr.h" | 10 #include "base/memory/scoped_ptr.h" |
| (...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 98 | 98 |
| 99 // Windows for the left and right activities shown in SCROLLING and ACTIVE | 99 // Windows for the left and right activities shown in SCROLLING and ACTIVE |
| 100 // states. In INACTIVE state these are NULL. | 100 // states. In INACTIVE state these are NULL. |
| 101 aura::Window* left_window_; | 101 aura::Window* left_window_; |
| 102 aura::Window* right_window_; | 102 aura::Window* right_window_; |
| 103 | 103 |
| 104 // Position of the separator between left_window_ and right_window_ in | 104 // Position of the separator between left_window_ and right_window_ in |
| 105 // container_ coordinates (along the x axis). | 105 // container_ coordinates (along the x axis). |
| 106 int separator_position_; | 106 int separator_position_; |
| 107 | 107 |
| 108 // Windows which should be hidden when the animation initiated by |
| 109 // UpdateLayout() completes. |
| 110 std::vector<aura::Window*> to_hide_; |
| 111 |
| 108 base::WeakPtrFactory<SplitViewController> weak_factory_; | 112 base::WeakPtrFactory<SplitViewController> weak_factory_; |
| 109 | 113 |
| 110 DISALLOW_COPY_AND_ASSIGN(SplitViewController); | 114 DISALLOW_COPY_AND_ASSIGN(SplitViewController); |
| 111 }; | 115 }; |
| 112 | 116 |
| 113 } // namespace athena | 117 } // namespace athena |
| 114 | 118 |
| 115 #endif // ATHENA_WM_SPLIT_VIEW_CONTROLLER_H_ | 119 #endif // ATHENA_WM_SPLIT_VIEW_CONTROLLER_H_ |
| OLD | NEW |