Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1455)

Unified Diff: ash/common/system/chromeos/network/network_info.h

Issue 2435903002: Move tray code from ui/chromeos/network/ (Closed)
Patch Set: Rebase Created 4 years, 2 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
Index: ash/common/system/chromeos/network/network_info.h
diff --git a/ui/chromeos/network/network_info.h b/ash/common/system/chromeos/network/network_info.h
similarity index 71%
rename from ui/chromeos/network/network_info.h
rename to ash/common/system/chromeos/network/network_info.h
index c5448dea4afa9e49bc7db491885c4c0d759c46a4..9f6abd8bcdac1ba908ae3bce7128ae78f9751b7c 100644
--- a/ui/chromeos/network/network_info.h
+++ b/ash/common/system/chromeos/network/network_info.h
@@ -2,24 +2,23 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef UI_CHROMEOS_NETWORK_NETWORK_INFO_H_
-#define UI_CHROMEOS_NETWORK_NETWORK_INFO_H_
+#ifndef ASH_COMMON_SYSTEM_CHROMEOS_NETWORK_NETWORK_INFO_H_
+#define ASH_COMMON_SYSTEM_CHROMEOS_NETWORK_NETWORK_INFO_H_
#include <string>
#include "base/strings/string16.h"
-#include "ui/chromeos/ui_chromeos_export.h"
#include "ui/gfx/image/image_skia.h"
namespace gfx {
class ImageSkia;
}
-namespace ui {
+namespace ash {
// Includes information necessary about a network for displaying the appropriate
// UI to the user.
-struct UI_CHROMEOS_EXPORT NetworkInfo {
+struct NetworkInfo {
NetworkInfo();
NetworkInfo(const std::string& path);
~NetworkInfo();
@@ -33,6 +32,6 @@ struct UI_CHROMEOS_EXPORT NetworkInfo {
bool is_wifi;
};
-} // namespace ui
+} // namespace ash
-#endif // UI_CHROMEOS_NETWORK_NETWORK_INFO_H_
+#endif // ASH_COMMON_SYSTEM_CHROMEOS_NETWORK_NETWORK_INFO_H_

Powered by Google App Engine
This is Rietveld 408576698