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 "components/sessions/core/session_service_commands.h" | 5 #include "components/sessions/core/session_service_commands.h" |
6 | 6 |
7 #include <stdint.h> | 7 #include <stdint.h> |
8 #include <string.h> | 8 #include <string.h> |
9 | 9 |
10 #include <utility> | 10 #include <utility> |
(...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
107 // never change. | 107 // never change. |
108 enum PersistedWindowShowState { | 108 enum PersistedWindowShowState { |
109 // SHOW_STATE_DEFAULT (0) never persisted. | 109 // SHOW_STATE_DEFAULT (0) never persisted. |
110 PERSISTED_SHOW_STATE_NORMAL = 1, | 110 PERSISTED_SHOW_STATE_NORMAL = 1, |
111 PERSISTED_SHOW_STATE_MINIMIZED = 2, | 111 PERSISTED_SHOW_STATE_MINIMIZED = 2, |
112 PERSISTED_SHOW_STATE_MAXIMIZED = 3, | 112 PERSISTED_SHOW_STATE_MAXIMIZED = 3, |
113 // SHOW_STATE_INACTIVE (4) never persisted. | 113 // SHOW_STATE_INACTIVE (4) never persisted. |
114 PERSISTED_SHOW_STATE_FULLSCREEN = 5, | 114 PERSISTED_SHOW_STATE_FULLSCREEN = 5, |
115 PERSISTED_SHOW_STATE_DETACHED_DEPRECATED = 6, | 115 PERSISTED_SHOW_STATE_DETACHED_DEPRECATED = 6, |
116 PERSISTED_SHOW_STATE_DOCKED_DEPRECATED = 7, | 116 PERSISTED_SHOW_STATE_DOCKED_DEPRECATED = 7, |
117 PERSISTED_SHOW_STATE_END = 7 | 117 PERSISTED_SHOW_STATE_END = 8, |
118 }; | 118 }; |
119 | 119 |
120 using IdToSessionTab = | 120 using IdToSessionTab = |
121 std::map<SessionID::id_type, std::unique_ptr<SessionTab>>; | 121 std::map<SessionID::id_type, std::unique_ptr<SessionTab>>; |
122 using IdToSessionWindow = | 122 using IdToSessionWindow = |
123 std::map<SessionID::id_type, std::unique_ptr<SessionWindow>>; | 123 std::map<SessionID::id_type, std::unique_ptr<SessionWindow>>; |
124 | 124 |
125 // Assert to ensure PersistedWindowShowState is updated if ui::WindowShowState | 125 // Assert to ensure PersistedWindowShowState is updated if ui::WindowShowState |
126 // is changed. | 126 // is changed. |
127 static_assert(ui::SHOW_STATE_END == | 127 static_assert(ui::SHOW_STATE_END == |
128 static_cast<ui::WindowShowState>(PERSISTED_SHOW_STATE_END), | 128 (static_cast<ui::WindowShowState>(PERSISTED_SHOW_STATE_END) - |
129 "SHOW_STATE_END must equal PERSISTED_SHOW_STATE_END"); | 129 2), |
130 | 130 "SHOW_STATE_END must equal PERSISTED_SHOW_STATE_END minus the " |
| 131 "deprecated entries"); |
131 // Returns the show state to store to disk based |state|. | 132 // Returns the show state to store to disk based |state|. |
132 PersistedWindowShowState ShowStateToPersistedShowState( | 133 PersistedWindowShowState ShowStateToPersistedShowState( |
133 ui::WindowShowState state) { | 134 ui::WindowShowState state) { |
134 switch (state) { | 135 switch (state) { |
135 case ui::SHOW_STATE_NORMAL: | 136 case ui::SHOW_STATE_NORMAL: |
136 return PERSISTED_SHOW_STATE_NORMAL; | 137 return PERSISTED_SHOW_STATE_NORMAL; |
137 case ui::SHOW_STATE_MINIMIZED: | 138 case ui::SHOW_STATE_MINIMIZED: |
138 return PERSISTED_SHOW_STATE_MINIMIZED; | 139 return PERSISTED_SHOW_STATE_MINIMIZED; |
139 case ui::SHOW_STATE_MAXIMIZED: | 140 case ui::SHOW_STATE_MAXIMIZED: |
140 return PERSISTED_SHOW_STATE_MAXIMIZED; | 141 return PERSISTED_SHOW_STATE_MAXIMIZED; |
141 case ui::SHOW_STATE_FULLSCREEN: | 142 case ui::SHOW_STATE_FULLSCREEN: |
142 return PERSISTED_SHOW_STATE_FULLSCREEN; | 143 return PERSISTED_SHOW_STATE_FULLSCREEN; |
143 | |
144 // TODO(afakhry): Remove Docked Windows in M58. | |
145 case ui::SHOW_STATE_DOCKED: | |
146 return PERSISTED_SHOW_STATE_DOCKED_DEPRECATED; | |
147 | |
148 case ui::SHOW_STATE_DEFAULT: | 144 case ui::SHOW_STATE_DEFAULT: |
149 case ui::SHOW_STATE_INACTIVE: | 145 case ui::SHOW_STATE_INACTIVE: |
150 return PERSISTED_SHOW_STATE_NORMAL; | 146 return PERSISTED_SHOW_STATE_NORMAL; |
151 | 147 |
152 case ui::SHOW_STATE_END: | 148 case ui::SHOW_STATE_END: |
153 break; | 149 break; |
154 } | 150 } |
155 NOTREACHED(); | 151 NOTREACHED(); |
156 return PERSISTED_SHOW_STATE_NORMAL; | 152 return PERSISTED_SHOW_STATE_NORMAL; |
157 } | 153 } |
158 | 154 |
159 // Lints show state values when read back from persited disk. | 155 // Lints show state values when read back from persited disk. |
160 ui::WindowShowState PersistedShowStateToShowState(int state) { | 156 ui::WindowShowState PersistedShowStateToShowState(int state) { |
161 switch (state) { | 157 switch (state) { |
162 case PERSISTED_SHOW_STATE_NORMAL: | 158 case PERSISTED_SHOW_STATE_NORMAL: |
163 return ui::SHOW_STATE_NORMAL; | 159 return ui::SHOW_STATE_NORMAL; |
164 case PERSISTED_SHOW_STATE_MINIMIZED: | 160 case PERSISTED_SHOW_STATE_MINIMIZED: |
165 return ui::SHOW_STATE_MINIMIZED; | 161 return ui::SHOW_STATE_MINIMIZED; |
166 case PERSISTED_SHOW_STATE_MAXIMIZED: | 162 case PERSISTED_SHOW_STATE_MAXIMIZED: |
167 return ui::SHOW_STATE_MAXIMIZED; | 163 return ui::SHOW_STATE_MAXIMIZED; |
168 case PERSISTED_SHOW_STATE_FULLSCREEN: | 164 case PERSISTED_SHOW_STATE_FULLSCREEN: |
169 return ui::SHOW_STATE_FULLSCREEN; | 165 return ui::SHOW_STATE_FULLSCREEN; |
| 166 case PERSISTED_SHOW_STATE_DETACHED_DEPRECATED: |
170 case PERSISTED_SHOW_STATE_DOCKED_DEPRECATED: | 167 case PERSISTED_SHOW_STATE_DOCKED_DEPRECATED: |
171 return ui::SHOW_STATE_DOCKED; | |
172 case PERSISTED_SHOW_STATE_DETACHED_DEPRECATED: | |
173 return ui::SHOW_STATE_NORMAL; | 168 return ui::SHOW_STATE_NORMAL; |
174 } | 169 } |
175 NOTREACHED(); | 170 NOTREACHED(); |
176 return ui::SHOW_STATE_NORMAL; | 171 return ui::SHOW_STATE_NORMAL; |
177 } | 172 } |
178 | 173 |
179 // Iterates through the vector updating the selected_tab_index of each | 174 // Iterates through the vector updating the selected_tab_index of each |
180 // SessionWindow based on the actual tabs that were restored. | 175 // SessionWindow based on the actual tabs that were restored. |
181 void UpdateSelectedTabIndex( | 176 void UpdateSelectedTabIndex( |
182 std::vector<std::unique_ptr<SessionWindow>>* windows) { | 177 std::vector<std::unique_ptr<SessionWindow>>* windows) { |
(...skipping 712 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
895 SortTabsBasedOnVisualOrderAndClear(&windows, valid_windows); | 890 SortTabsBasedOnVisualOrderAndClear(&windows, valid_windows); |
896 UpdateSelectedTabIndex(valid_windows); | 891 UpdateSelectedTabIndex(valid_windows); |
897 } | 892 } |
898 // AddTabsToWindows should have processed all the tabs. | 893 // AddTabsToWindows should have processed all the tabs. |
899 DCHECK_EQ(0u, tabs.size()); | 894 DCHECK_EQ(0u, tabs.size()); |
900 // SortTabsBasedOnVisualOrderAndClear should have processed all the windows. | 895 // SortTabsBasedOnVisualOrderAndClear should have processed all the windows. |
901 DCHECK_EQ(0u, windows.size()); | 896 DCHECK_EQ(0u, windows.size()); |
902 } | 897 } |
903 | 898 |
904 } // namespace sessions | 899 } // namespace sessions |
OLD | NEW |