| 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 = 7, | 116 PERSISTED_SHOW_STATE_DOCKED = 7, |
| 117 PERSISTED_SHOW_STATE_END = 7 | 117 // SHOW_STATE_PREVIOUS (8) never persisted. |
| 118 PERSISTED_SHOW_STATE_PREVIOUS = 8, |
| 119 PERSISTED_SHOW_STATE_END = 8 |
| 118 }; | 120 }; |
| 119 | 121 |
| 120 using IdToSessionTab = | 122 using IdToSessionTab = |
| 121 std::map<SessionID::id_type, std::unique_ptr<SessionTab>>; | 123 std::map<SessionID::id_type, std::unique_ptr<SessionTab>>; |
| 122 using IdToSessionWindow = | 124 using IdToSessionWindow = |
| 123 std::map<SessionID::id_type, std::unique_ptr<SessionWindow>>; | 125 std::map<SessionID::id_type, std::unique_ptr<SessionWindow>>; |
| 124 | 126 |
| 125 // Assert to ensure PersistedWindowShowState is updated if ui::WindowShowState | 127 // Assert to ensure PersistedWindowShowState is updated if ui::WindowShowState |
| 126 // is changed. | 128 // is changed. |
| 127 static_assert(ui::SHOW_STATE_END == | 129 static_assert(ui::SHOW_STATE_END == |
| (...skipping 12 matching lines...) Expand all Loading... |
| 140 return PERSISTED_SHOW_STATE_MAXIMIZED; | 142 return PERSISTED_SHOW_STATE_MAXIMIZED; |
| 141 case ui::SHOW_STATE_FULLSCREEN: | 143 case ui::SHOW_STATE_FULLSCREEN: |
| 142 return PERSISTED_SHOW_STATE_FULLSCREEN; | 144 return PERSISTED_SHOW_STATE_FULLSCREEN; |
| 143 case ui::SHOW_STATE_DOCKED: | 145 case ui::SHOW_STATE_DOCKED: |
| 144 return PERSISTED_SHOW_STATE_DOCKED; | 146 return PERSISTED_SHOW_STATE_DOCKED; |
| 145 | 147 |
| 146 case ui::SHOW_STATE_DEFAULT: | 148 case ui::SHOW_STATE_DEFAULT: |
| 147 case ui::SHOW_STATE_INACTIVE: | 149 case ui::SHOW_STATE_INACTIVE: |
| 148 return PERSISTED_SHOW_STATE_NORMAL; | 150 return PERSISTED_SHOW_STATE_NORMAL; |
| 149 | 151 |
| 152 case ui::SHOW_STATE_PREVIOUS: |
| 150 case ui::SHOW_STATE_END: | 153 case ui::SHOW_STATE_END: |
| 151 break; | 154 break; |
| 152 } | 155 } |
| 153 NOTREACHED(); | 156 NOTREACHED(); |
| 154 return PERSISTED_SHOW_STATE_NORMAL; | 157 return PERSISTED_SHOW_STATE_NORMAL; |
| 155 } | 158 } |
| 156 | 159 |
| 157 // Lints show state values when read back from persited disk. | 160 // Lints show state values when read back from persited disk. |
| 158 ui::WindowShowState PersistedShowStateToShowState(int state) { | 161 ui::WindowShowState PersistedShowStateToShowState(int state) { |
| 159 switch (state) { | 162 switch (state) { |
| (...skipping 733 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 893 SortTabsBasedOnVisualOrderAndClear(&windows, valid_windows); | 896 SortTabsBasedOnVisualOrderAndClear(&windows, valid_windows); |
| 894 UpdateSelectedTabIndex(valid_windows); | 897 UpdateSelectedTabIndex(valid_windows); |
| 895 } | 898 } |
| 896 // AddTabsToWindows should have processed all the tabs. | 899 // AddTabsToWindows should have processed all the tabs. |
| 897 DCHECK_EQ(0u, tabs.size()); | 900 DCHECK_EQ(0u, tabs.size()); |
| 898 // SortTabsBasedOnVisualOrderAndClear should have processed all the windows. | 901 // SortTabsBasedOnVisualOrderAndClear should have processed all the windows. |
| 899 DCHECK_EQ(0u, windows.size()); | 902 DCHECK_EQ(0u, windows.size()); |
| 900 } | 903 } |
| 901 | 904 |
| 902 } // namespace sessions | 905 } // namespace sessions |
| OLD | NEW |