| Index: ash/metrics/user_metrics_recorder.cc
|
| diff --git a/ash/metrics/user_metrics_recorder.cc b/ash/metrics/user_metrics_recorder.cc
|
| index 414ce2f5afa319e47334524adbd9b8c042769e24..c84072fc199ceacbced6af35d5ce4cff8c3ef8ec 100644
|
| --- a/ash/metrics/user_metrics_recorder.cc
|
| +++ b/ash/metrics/user_metrics_recorder.cc
|
| @@ -37,7 +37,6 @@ enum ActiveWindowStateType {
|
| ACTIVE_WINDOW_STATE_TYPE_MAXIMIZED,
|
| ACTIVE_WINDOW_STATE_TYPE_FULLSCREEN,
|
| ACTIVE_WINDOW_STATE_TYPE_SNAPPED,
|
| - ACTIVE_WINDOW_STATE_TYPE_DOCKED,
|
| ACTIVE_WINDOW_STATE_TYPE_PINNED,
|
| ACTIVE_WINDOW_STATE_TYPE_TRUSTED_PINNED,
|
| ACTIVE_WINDOW_STATE_TYPE_COUNT,
|
| @@ -59,10 +58,6 @@ ActiveWindowStateType GetActiveWindowState() {
|
| case wm::WINDOW_STATE_TYPE_RIGHT_SNAPPED:
|
| active_window_state_type = ACTIVE_WINDOW_STATE_TYPE_SNAPPED;
|
| break;
|
| - case wm::WINDOW_STATE_TYPE_DOCKED:
|
| - case wm::WINDOW_STATE_TYPE_DOCKED_MINIMIZED:
|
| - active_window_state_type = ACTIVE_WINDOW_STATE_TYPE_DOCKED;
|
| - break;
|
| case wm::WINDOW_STATE_TYPE_PINNED:
|
| active_window_state_type = ACTIVE_WINDOW_STATE_TYPE_PINNED;
|
| break;
|
| @@ -120,8 +115,10 @@ bool IsUserActive() {
|
| // container to the lowest to allow the |GetNumVisibleWindows| method to short
|
| // circuit when processing a maximized or fullscreen window.
|
| int kVisibleWindowContainerIds[] = {
|
| - kShellWindowId_PanelContainer, kShellWindowId_DockedContainer,
|
| - kShellWindowId_AlwaysOnTopContainer, kShellWindowId_DefaultContainer};
|
| + kShellWindowId_PanelContainer,
|
| + kShellWindowId_AlwaysOnTopContainer,
|
| + kShellWindowId_DefaultContainer
|
| +};
|
|
|
| // Returns an approximate count of how many windows are currently visible in the
|
| // primary root window.
|
|
|