ash/common/system/chromeos/settings/tray_settings.h - Issue 2072013002: mash: Move tray settings and deps to common.

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.h

Issue 2072013002: mash: Move tray settings and deps to common. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Undo 'git cl format' and nullptr changes. Created 4 years, 6 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.h

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

similarity index 83%

rename from ash/system/chromeos/settings/tray_settings.h

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

index 5f5e0f891cc45465511f9bfc9487c5284a291b2b..2a46942b47c9550f4f16718717d28c6ed5bf3541 100644

--- a/ash/system/chromeos/settings/tray_settings.h

+++ b/ash/common/system/chromeos/settings/tray_settings.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_SYSTEM_CHROMEOS_SETTINGS_TRAY_SETTINGS_H_

-#define ASH_SYSTEM_CHROMEOS_SETTINGS_TRAY_SETTINGS_H_

+#ifndef ASH_COMMON_SYSTEM_CHROMEOS_SETTINGS_TRAY_SETTINGS_H_

+#define ASH_COMMON_SYSTEM_CHROMEOS_SETTINGS_TRAY_SETTINGS_H_

#include "ash/common/system/tray/system_tray_item.h"

#include "base/macros.h"

@@ -35,4 +35,4 @@ class TraySettings : public SystemTrayItem {

} // namespace ash

-#endif // ASH_SYSTEM_CHROMEOS_SETTINGS_TRAY_SETTINGS_H_

+#endif // ASH_COMMON_SYSTEM_CHROMEOS_SETTINGS_TRAY_SETTINGS_H_