ash/common/system/tray/tray_background_view.h - 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/tray/tray_background_view.h

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/tray/tray_background_view.h

diff --git a/ash/system/tray/tray_background_view.h b/ash/common/system/tray/tray_background_view.h

similarity index 96%

rename from ash/system/tray/tray_background_view.h

rename to ash/common/system/tray/tray_background_view.h

index a35f82803896e9d5a9c90f6d7a8456896128bb88..49e71055e55adee2fc1244a00d2b6f4ef0d96dff 100644

--- a/ash/system/tray/tray_background_view.h

+++ b/ash/common/system/tray/tray_background_view.h

@@ -2,15 +2,15 @@

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

// found in the LICENSE file.

-#ifndef ASH_SYSTEM_TRAY_TRAY_BACKGROUND_VIEW_H_

-#define ASH_SYSTEM_TRAY_TRAY_BACKGROUND_VIEW_H_

+#ifndef ASH_COMMON_SYSTEM_TRAY_TRAY_BACKGROUND_VIEW_H_

+#define ASH_COMMON_SYSTEM_TRAY_TRAY_BACKGROUND_VIEW_H_

#include <memory>

#include "ash/ash_export.h"

#include "ash/common/shelf/shelf_background_animator_observer.h"

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

#include "ash/public/cpp/shelf_types.h"

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

#include "base/macros.h"

#include "ui/compositor/layer_animation_observer.h"

#include "ui/gfx/geometry/insets.h"

@@ -194,4 +194,4 @@ class ASH_EXPORT TrayBackgroundView : public ActionableView,

} // namespace ash

-#endif // ASH_SYSTEM_TRAY_TRAY_BACKGROUND_VIEW_H_

+#endif // ASH_COMMON_SYSTEM_TRAY_TRAY_BACKGROUND_VIEW_H_