Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1041)

Unified Diff: ash/common/wm/wm_types.cc

Issue 2736573002: chromeos: Move files in //ash/common to //ash, part 2 (Closed)
Patch Set: Created 3 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/common/wm/wm_types.h ('k') | ash/common/wm/wm_window_animations.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/common/wm/wm_types.cc
diff --git a/ash/common/wm/wm_types.cc b/ash/common/wm/wm_types.cc
deleted file mode 100644
index 4deed1a06abb8fc189971cbd363ddbd949d736c0..0000000000000000000000000000000000000000
--- a/ash/common/wm/wm_types.cc
+++ /dev/null
@@ -1,60 +0,0 @@
-// Copyright 2013 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "ash/common/wm/wm_types.h"
-
-#include "base/logging.h"
-
-namespace ash {
-namespace wm {
-
-// This is to catch the change to WindowShowState.
-static_assert(ui::SHOW_STATE_END ==
- static_cast<ui::WindowShowState>(WINDOW_STATE_TYPE_END),
- "show enum mismatch");
-
-WindowStateType ToWindowStateType(ui::WindowShowState state) {
- return static_cast<WindowStateType>(state);
-}
-
-ui::WindowShowState ToWindowShowState(WindowStateType type) {
- switch (type) {
- case WINDOW_STATE_TYPE_DEFAULT:
- return ui::SHOW_STATE_DEFAULT;
- case WINDOW_STATE_TYPE_NORMAL:
- case WINDOW_STATE_TYPE_RIGHT_SNAPPED:
- case WINDOW_STATE_TYPE_LEFT_SNAPPED:
- case WINDOW_STATE_TYPE_AUTO_POSITIONED:
- return ui::SHOW_STATE_NORMAL;
-
- // TODO(afakhry): Remove Docked Windows in M58.
- case WINDOW_STATE_TYPE_DOCKED:
- return ui::SHOW_STATE_DOCKED;
- case WINDOW_STATE_TYPE_MINIMIZED:
- case WINDOW_STATE_TYPE_DOCKED_MINIMIZED:
- return ui::SHOW_STATE_MINIMIZED;
- case WINDOW_STATE_TYPE_MAXIMIZED:
- return ui::SHOW_STATE_MAXIMIZED;
- case WINDOW_STATE_TYPE_INACTIVE:
- return ui::SHOW_STATE_INACTIVE;
- case WINDOW_STATE_TYPE_FULLSCREEN:
- case WINDOW_STATE_TYPE_PINNED:
- case WINDOW_STATE_TYPE_TRUSTED_PINNED:
- return ui::SHOW_STATE_FULLSCREEN;
- case WINDOW_STATE_TYPE_END:
- NOTREACHED();
- }
- NOTREACHED();
- return ui::SHOW_STATE_DEFAULT;
-}
-
-bool IsMaximizedOrFullscreenOrPinnedWindowStateType(WindowStateType type) {
- return type == WINDOW_STATE_TYPE_MAXIMIZED ||
- type == WINDOW_STATE_TYPE_FULLSCREEN ||
- type == WINDOW_STATE_TYPE_PINNED ||
- type == WINDOW_STATE_TYPE_TRUSTED_PINNED;
-}
-
-} // namespace wm
-} // namespace ash
« no previous file with comments | « ash/common/wm/wm_types.h ('k') | ash/common/wm/wm_window_animations.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698