ash/common/system/chromeos/network/tray_network.h - Issue 2109293002: mash: Convert system tray network item to wm common types

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/network/tray_network.h

Issue 2109293002: mash: Convert system tray network item to wm common types (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: tweak string 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:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « ash/common/system/chromeos/network/network_state_list_detailed_view.cc ('k') | ash/common/system/chromeos/network/tray_network.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: ash/common/system/chromeos/network/tray_network.h

diff --git a/ash/system/chromeos/network/tray_network.h b/ash/common/system/chromeos/network/tray_network.h

similarity index 88%

rename from ash/system/chromeos/network/tray_network.h

rename to ash/common/system/chromeos/network/tray_network.h

index e4c05c0f6ff2a5c7be313f90da443883738545ac..b95a27c0022ddd5157d073099ec366e4634f4ee0 100644

--- a/ash/system/chromeos/network/tray_network.h

+++ b/ash/common/system/chromeos/network/tray_network.h

@@ -2,16 +2,16 @@

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

// found in the LICENSE file.

-#ifndef ASH_SYSTEM_CHROMEOS_NETWORK_TRAY_NETWORK_H

-#define ASH_SYSTEM_CHROMEOS_NETWORK_TRAY_NETWORK_H

+#ifndef ASH_COMMON_SYSTEM_CHROMEOS_NETWORK_TRAY_NETWORK_H_

+#define ASH_COMMON_SYSTEM_CHROMEOS_NETWORK_TRAY_NETWORK_H_

#include <memory>

#include <set>

#include "ash/common/system/chromeos/network/network_observer.h"

#include "ash/common/system/chromeos/network/network_portal_detector_observer.h"

+#include "ash/common/system/chromeos/network/tray_network_state_observer.h"

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

-#include "ash/system/chromeos/network/tray_network_state_observer.h"

#include "base/macros.h"

#include "base/time/time.h"

@@ -67,4 +67,4 @@ class TrayNetwork : public SystemTrayItem,

} // namespace ash

-#endif // ASH_SYSTEM_CHROMEOS_NETWORK_TRAY_NETWORK_H

+#endif // ASH_COMMON_SYSTEM_CHROMEOS_NETWORK_TRAY_NETWORK_H_