ash/common/system/chromeos/settings/tray_settings.cc - Issue 2731873002: Revert "chromeos: Move files in //ash/common to //ash, part 1"

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: ash/common/system/chromeos/settings/tray_settings.cc

Issue 2731873002: Revert "chromeos: Move files in //ash/common to //ash, part 1" (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:

Index: ash/common/system/chromeos/settings/tray_settings.cc

diff --git a/ash/system/settings/tray_settings.cc b/ash/common/system/chromeos/settings/tray_settings.cc

similarity index 91%

rename from ash/system/settings/tray_settings.cc

rename to ash/common/system/chromeos/settings/tray_settings.cc

index 6678414945854cb76d9af2653e24f11b77b2b2cc..4b613ffc97878ea70cf4ed2cc4a484ad146037de 100644

--- a/ash/system/settings/tray_settings.cc

+++ b/ash/common/system/chromeos/settings/tray_settings.cc

@@ -2,21 +2,21 @@

// Use of this source code is governed by a BSD-style license that can be

// found in the LICENSE file.

-#include "ash/system/settings/tray_settings.h"

+#include "ash/common/system/chromeos/settings/tray_settings.h"

#include "ash/common/material_design/material_design_controller.h"

#include "ash/common/session/session_state_delegate.h"

+#include "ash/common/system/chromeos/power/power_status.h"

+#include "ash/common/system/chromeos/power/power_status_view.h"

+#include "ash/common/system/tray/actionable_view.h"

+#include "ash/common/system/tray/fixed_sized_image_view.h"

+#include "ash/common/system/tray/system_tray_controller.h"

+#include "ash/common/system/tray/system_tray_delegate.h"

+#include "ash/common/system/tray/tray_constants.h"

+#include "ash/common/system/tray/tray_popup_utils.h"

#include "ash/common/wm_shell.h"

#include "ash/resources/grit/ash_resources.h"

#include "ash/strings/grit/ash_strings.h"

-#include "ash/system/power/power_status.h"

-#include "ash/system/power/power_status_view.h"

-#include "ash/system/tray/actionable_view.h"

-#include "ash/system/tray/fixed_sized_image_view.h"

-#include "ash/system/tray/system_tray_controller.h"

-#include "ash/system/tray/system_tray_delegate.h"

-#include "ash/system/tray/tray_constants.h"

-#include "ash/system/tray/tray_popup_utils.h"

#include "base/logging.h"

#include "base/strings/utf_string_conversions.h"

#include "third_party/skia/include/core/SkColor.h"