diff options
| author | varkha <varkha@chromium.org> | 2015-05-05 11:12:31 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-05-05 18:13:09 +0000 |
| commit | 74014e0e926e2170188c9d7cc4706ccba36448c9 (patch) | |
| tree | 1675abdf89ce226c93b6cf249eba29f7ff106b7e /components/sessions | |
| parent | e28d513833e8084b1036af9cbc076541d3d9db62 (diff) | |
| download | chromium_src-74014e0e926e2170188c9d7cc4706ccba36448c9.zip chromium_src-74014e0e926e2170188c9d7cc4706ccba36448c9.tar.gz chromium_src-74014e0e926e2170188c9d7cc4706ccba36448c9.tar.bz2 | |
[Docking] Persists docked state for chrome app and extension windows on Chrome OS. Browser windows should not be affected - the browser will start normal or maximized but never initially docked.
BUG=271582
Review URL: https://codereview.chromium.org/1056793006
Cr-Commit-Position: refs/heads/master@{#328356}
Diffstat (limited to 'components/sessions')
| -rw-r--r-- | components/sessions/session_service_commands.cc | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/components/sessions/session_service_commands.cc b/components/sessions/session_service_commands.cc index 3b5f8a1..eca2b4d 100644 --- a/components/sessions/session_service_commands.cc +++ b/components/sessions/session_service_commands.cc @@ -99,7 +99,8 @@ enum PersistedWindowShowState { // SHOW_STATE_INACTIVE (4) never persisted. PERSISTED_SHOW_STATE_FULLSCREEN = 5, PERSISTED_SHOW_STATE_DETACHED_DEPRECATED = 6, - PERSISTED_SHOW_STATE_END = 6 + PERSISTED_SHOW_STATE_DOCKED = 7, + PERSISTED_SHOW_STATE_END = 7 }; typedef std::map<SessionID::id_type, SessionTab*> IdToSessionTab; @@ -123,6 +124,8 @@ PersistedWindowShowState ShowStateToPersistedShowState( return PERSISTED_SHOW_STATE_MAXIMIZED; case ui::SHOW_STATE_FULLSCREEN: return PERSISTED_SHOW_STATE_FULLSCREEN; + case ui::SHOW_STATE_DOCKED: + return PERSISTED_SHOW_STATE_DOCKED; case ui::SHOW_STATE_DEFAULT: case ui::SHOW_STATE_INACTIVE: @@ -146,6 +149,8 @@ ui::WindowShowState PersistedShowStateToShowState(int state) { return ui::SHOW_STATE_MAXIMIZED; case PERSISTED_SHOW_STATE_FULLSCREEN: return ui::SHOW_STATE_FULLSCREEN; + case PERSISTED_SHOW_STATE_DOCKED: + return ui::SHOW_STATE_DOCKED; case PERSISTED_SHOW_STATE_DETACHED_DEPRECATED: return ui::SHOW_STATE_NORMAL; } |