From f3bc2db7fd84d02ca6bb0adcc8e72a813df584cc Mon Sep 17 00:00:00 2001 From: sky Date: Tue, 13 Sep 2016 06:18:24 -0700 Subject: [PATCH] Moves ScreenDimmer to ash/common It no longer has any deps on non-common types. BUG=640781 TEST=covered by tests R=jamescook@chromium.org Review-Url: https://codereview.chromium.org/2334013003 Cr-Commit-Position: refs/heads/master@{#418226} --- ash/BUILD.gn | 4 ++-- ash/{ => common}/wm/screen_dimmer.cc | 2 +- ash/{ => common}/wm/screen_dimmer.h | 6 +++--- ash/wm/screen_dimmer_unittest.cc | 2 +- .../dbus/chrome_display_power_service_provider_delegate.cc | 2 +- chrome/browser/ui/webui/chromeos/login/oobe_ui.cc | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) rename ash/{ => common}/wm/screen_dimmer.cc (98%) rename ash/{ => common}/wm/screen_dimmer.h (94%) diff --git a/ash/BUILD.gn b/ash/BUILD.gn index e89b562b7205b2..3766d01a249d5d 100644 --- a/ash/BUILD.gn +++ b/ash/BUILD.gn @@ -487,6 +487,8 @@ component("ash") { "common/wm/root_window_finder.h", "common/wm/root_window_layout_manager.cc", "common/wm/root_window_layout_manager.h", + "common/wm/screen_dimmer.cc", + "common/wm/screen_dimmer.h", "common/wm/switchable_windows.cc", "common/wm/switchable_windows.h", "common/wm/system_modal_container_layout_manager.cc", @@ -778,8 +780,6 @@ component("ash") { "wm/resize_shadow.h", "wm/resize_shadow_controller.cc", "wm/resize_shadow_controller.h", - "wm/screen_dimmer.cc", - "wm/screen_dimmer.h", "wm/screen_pinning_controller.cc", "wm/screen_pinning_controller.h", "wm/session_state_animator.cc", diff --git a/ash/wm/screen_dimmer.cc b/ash/common/wm/screen_dimmer.cc similarity index 98% rename from ash/wm/screen_dimmer.cc rename to ash/common/wm/screen_dimmer.cc index 3d89039722e9da..b00ac9052f7831 100644 --- a/ash/wm/screen_dimmer.cc +++ b/ash/common/wm/screen_dimmer.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ash/wm/screen_dimmer.h" +#include "ash/common/wm/screen_dimmer.h" #include "ash/common/shell_window_ids.h" #include "ash/common/wm/container_finder.h" diff --git a/ash/wm/screen_dimmer.h b/ash/common/wm/screen_dimmer.h similarity index 94% rename from ash/wm/screen_dimmer.h rename to ash/common/wm/screen_dimmer.h index 90064bfe4dcc03..1667b057553fe9 100644 --- a/ash/wm/screen_dimmer.h +++ b/ash/common/wm/screen_dimmer.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef ASH_WM_SCREEN_DIMMER_H_ -#define ASH_WM_SCREEN_DIMMER_H_ +#ifndef ASH_COMMON_WM_SCREEN_DIMMER_H_ +#define ASH_COMMON_WM_SCREEN_DIMMER_H_ #include #include @@ -77,4 +77,4 @@ class ASH_EXPORT ScreenDimmer : public ShellObserver { } // namespace ash -#endif // ASH_WM_SCREEN_DIMMER_H_ +#endif // ASH_COMMON_WM_SCREEN_DIMMER_H_ diff --git a/ash/wm/screen_dimmer_unittest.cc b/ash/wm/screen_dimmer_unittest.cc index 3f2100e5be52ca..336b47b1c52ecb 100644 --- a/ash/wm/screen_dimmer_unittest.cc +++ b/ash/wm/screen_dimmer_unittest.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ash/wm/screen_dimmer.h" +#include "ash/common/wm/screen_dimmer.h" #include diff --git a/chrome/browser/chromeos/dbus/chrome_display_power_service_provider_delegate.cc b/chrome/browser/chromeos/dbus/chrome_display_power_service_provider_delegate.cc index 1dcf74411703e9..ed2cefc58047ef 100644 --- a/chrome/browser/chromeos/dbus/chrome_display_power_service_provider_delegate.cc +++ b/chrome/browser/chromeos/dbus/chrome_display_power_service_provider_delegate.cc @@ -4,8 +4,8 @@ #include "chrome/browser/chromeos/dbus/chrome_display_power_service_provider_delegate.h" +#include "ash/common/wm/screen_dimmer.h" #include "ash/shell.h" -#include "ash/wm/screen_dimmer.h" #include "base/memory/ptr_util.h" #include "ui/base/user_activity/user_activity_detector.h" #include "ui/display/chromeos/display_configurator.h" diff --git a/chrome/browser/ui/webui/chromeos/login/oobe_ui.cc b/chrome/browser/ui/webui/chromeos/login/oobe_ui.cc index 3e2fe433066961..9174cab89ae7ad 100644 --- a/chrome/browser/ui/webui/chromeos/login/oobe_ui.cc +++ b/chrome/browser/ui/webui/chromeos/login/oobe_ui.cc @@ -8,7 +8,7 @@ #include -#include "ash/wm/screen_dimmer.h" +#include "ash/common/wm/screen_dimmer.h" #include "base/command_line.h" #include "base/logging.h" #include "base/macros.h"