diff options
| author | tapted@chromium.org <tapted@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-19 09:36:34 +0000 |
|---|---|---|
| committer | tapted@chromium.org <tapted@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-19 09:37:59 +0000 |
| commit | f0d25425ccc861ef74a46d44f6e16784a81de062 (patch) | |
| tree | 2dcf6d934e08996cb24dc378c5cf8d57ca0770b2 /ash | |
| parent | f279f433ed3e36738ebddf7e784ff3107b318ef2 (diff) | |
| download | chromium_src-f0d25425ccc861ef74a46d44f6e16784a81de062.zip chromium_src-f0d25425ccc861ef74a46d44f6e16784a81de062.tar.gz chromium_src-f0d25425ccc861ef74a46d44f6e16784a81de062.tar.bz2 | |
Remove ui::SHOW_STATE_DETACHED and related things
Removes enum values ui::SHOW_STATE_DETACHED and
wm::WINDOW_STATE_TYPE_DETACHED, and bool NativeAppWindow::IsDetached().
These were added a year ago in r198918 but nothing currently uses them.
PersistedWindowShowState is added in session_service.cc to decouple the
on-disk state from the enum in ui_base_types.h.
BUG=233556
Review URL: https://codereview.chromium.org/337243005
Cr-Commit-Position: refs/heads/master@{#290526}
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@290526 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash')
| -rw-r--r-- | ash/metrics/user_metrics_recorder.cc | 1 | ||||
| -rw-r--r-- | ash/wm/default_state.cc | 1 | ||||
| -rw-r--r-- | ash/wm/window_state.cc | 1 | ||||
| -rw-r--r-- | ash/wm/wm_types.cc | 2 | ||||
| -rw-r--r-- | ash/wm/wm_types.h | 1 |
5 files changed, 0 insertions, 6 deletions
diff --git a/ash/metrics/user_metrics_recorder.cc b/ash/metrics/user_metrics_recorder.cc index 37757450..98f0b7f 100644 --- a/ash/metrics/user_metrics_recorder.cc +++ b/ash/metrics/user_metrics_recorder.cc @@ -420,7 +420,6 @@ void UserMetricsRecorder::RecordPeriodicMetrics() { case wm::WINDOW_STATE_TYPE_NORMAL: case wm::WINDOW_STATE_TYPE_MINIMIZED: case wm::WINDOW_STATE_TYPE_INACTIVE: - case wm::WINDOW_STATE_TYPE_DETACHED: case wm::WINDOW_STATE_TYPE_END: case wm::WINDOW_STATE_TYPE_AUTO_POSITIONED: active_window_state_type = ACTIVE_WINDOW_STATE_TYPE_OTHER; diff --git a/ash/wm/default_state.cc b/ash/wm/default_state.cc index 14633ef..a6e0ee2 100644 --- a/ash/wm/default_state.cc +++ b/ash/wm/default_state.cc @@ -543,7 +543,6 @@ void DefaultState::UpdateBoundsFromState(WindowState* window_state, case WINDOW_STATE_TYPE_MINIMIZED: break; case WINDOW_STATE_TYPE_INACTIVE: - case WINDOW_STATE_TYPE_DETACHED: case WINDOW_STATE_TYPE_END: case WINDOW_STATE_TYPE_AUTO_POSITIONED: return; diff --git a/ash/wm/window_state.cc b/ash/wm/window_state.cc index d0aacce..e60dc34 100644 --- a/ash/wm/window_state.cc +++ b/ash/wm/window_state.cc @@ -71,7 +71,6 @@ WMEventType WMEventTypeFromShowState(ui::WindowShowState requested_show_state) { return WM_EVENT_FULLSCREEN; case ui::SHOW_STATE_INACTIVE: return WM_EVENT_SHOW_INACTIVE; - case ui::SHOW_STATE_DETACHED: case ui::SHOW_STATE_END: NOTREACHED() << "No WMEvent defined for the show state:" << requested_show_state; diff --git a/ash/wm/wm_types.cc b/ash/wm/wm_types.cc index ca21014..2c86d11 100644 --- a/ash/wm/wm_types.cc +++ b/ash/wm/wm_types.cc @@ -37,8 +37,6 @@ ui::WindowShowState ToWindowShowState(WindowStateType type) { return ui::SHOW_STATE_INACTIVE; case WINDOW_STATE_TYPE_FULLSCREEN: return ui::SHOW_STATE_FULLSCREEN; - case WINDOW_STATE_TYPE_DETACHED: - return ui::SHOW_STATE_DETACHED; case WINDOW_STATE_TYPE_END: NOTREACHED(); } diff --git a/ash/wm/wm_types.h b/ash/wm/wm_types.h index 1006965..2045deb 100644 --- a/ash/wm/wm_types.h +++ b/ash/wm/wm_types.h @@ -27,7 +27,6 @@ enum WindowStateType { WINDOW_STATE_TYPE_MAXIMIZED, WINDOW_STATE_TYPE_INACTIVE, WINDOW_STATE_TYPE_FULLSCREEN, - WINDOW_STATE_TYPE_DETACHED, WINDOW_STATE_TYPE_END, // to avoid using SHOW_STATE_END // Ash specific states: |