ash/system/palette/palette_tray.h - Issue 2732813002: 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/system/palette/palette_tray.h

Issue 2732813002: chromeos: Move files in //ash/common to //ash, part 1 (Closed)

Patch Set: rebase 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/system/palette/palette_tray.h

diff --git a/ash/common/system/chromeos/palette/palette_tray.h b/ash/system/palette/palette_tray.h

similarity index 93%

rename from ash/common/system/chromeos/palette/palette_tray.h

rename to ash/system/palette/palette_tray.h

index b18c329fe0da4b4a951646cd5055785f2c1e1203..f3b22fbc595a386351a78180ef0ec520acc450ff 100644

--- a/ash/common/system/chromeos/palette/palette_tray.h

+++ b/ash/system/palette/palette_tray.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_COMMON_SYSTEM_CHROMEOS_PALETTE_PALETTE_BUTTON_TRAY_H_

-#define ASH_COMMON_SYSTEM_CHROMEOS_PALETTE_PALETTE_BUTTON_TRAY_H_

+#ifndef ASH_SYSTEM_PALETTE_PALETTE_TRAY_H_

+#define ASH_SYSTEM_PALETTE_PALETTE_TRAY_H_

#include <map>

#include <memory>

@@ -12,8 +12,8 @@

#include "ash/common/palette_delegate.h"

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

#include "ash/common/shell_observer.h"

-#include "ash/common/system/chromeos/palette/palette_tool_manager.h"

-#include "ash/common/system/tray/tray_background_view.h"

+#include "ash/system/palette/palette_tool_manager.h"

+#include "ash/system/tray/tray_background_view.h"

#include "base/macros.h"

#include "base/memory/weak_ptr.h"

#include "ui/events/devices/input_device_event_observer.h"

@@ -141,4 +141,4 @@ class ASH_EXPORT PaletteTray : public TrayBackgroundView,

} // namespace ash

-#endif // ASH_COMMON_SYSTEM_CHROMEOS_PALETTE_PALETTE_BUTTON_TRAY_H_

+#endif // ASH_SYSTEM_PALETTE_PALETTE_TRAY_H_