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

Unified Diff: ash/system/chromeos/network/network_connect.h

Issue 693493003: Revert "Move network_connect code to ui/chromeos/network" (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 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/system/chromeos/network/network_connect.h
diff --git a/ui/chromeos/network/network_connect.h b/ash/system/chromeos/network/network_connect.h
similarity index 93%
rename from ui/chromeos/network/network_connect.h
rename to ash/system/chromeos/network/network_connect.h
index 303a79e96b4e57255f855bbc6bcbf9703679de7c..382eb20c7ab802dedf2503b72fcff9c1d4b63951 100644
--- a/ui/chromeos/network/network_connect.h
+++ b/ash/system/chromeos/network/network_connect.h
@@ -2,13 +2,13 @@
// 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_CONNECT_H
-#define UI_CHROMEOS_NETWORK_NETWORK_CONNECT_H
+#ifndef ASH_SYSTEM_CHROMEOS_NETWORK_NETWORK_CONNECT_H
+#define ASH_SYSTEM_CHROMEOS_NETWORK_NETWORK_CONNECT_H
#include <string>
+#include "ash/ash_export.h"
#include "base/strings/string16.h"
-#include "ui/chromeos/ui_chromeos_export.h"
namespace base {
class DictionaryValue;
@@ -18,9 +18,9 @@ namespace chromeos {
class NetworkTypePattern;
}
-namespace ui {
+namespace ash {
-class UI_CHROMEOS_EXPORT NetworkConnect {
+class ASH_EXPORT NetworkConnect {
public:
class Delegate {
public:
@@ -110,6 +110,6 @@ class UI_CHROMEOS_EXPORT NetworkConnect {
DISALLOW_COPY_AND_ASSIGN(NetworkConnect);
};
-} // ui
+} // ash
-#endif // UI_CHROMEOS_NETWORK_NETWORK_CONNECT_H
+#endif // ASH_SYSTEM_CHROMEOS_NETWORK_NETWORK_CONNECT_H

Powered by Google App Engine
This is Rietveld 408576698