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

Unified Diff: ui/chromeos/network/network_connect.cc

Issue 690943003: Move network_connect code to ui/chromeos/network (Take 2) (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
« no previous file with comments | « ui/chromeos/network/network_connect.h ('k') | ui/chromeos/network/network_state_notifier.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/chromeos/network/network_connect.cc
diff --git a/ash/system/chromeos/network/network_connect.cc b/ui/chromeos/network/network_connect.cc
similarity index 99%
rename from ash/system/chromeos/network/network_connect.cc
rename to ui/chromeos/network/network_connect.cc
index 82c80f58fba4afe89d4b4cc70103c3571e8bb71f..75dd2d530da43ccd872216dc4f94a919d32b0e9a 100644
--- a/ash/system/chromeos/network/network_connect.cc
+++ b/ui/chromeos/network/network_connect.cc
@@ -2,9 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "ash/system/chromeos/network/network_connect.h"
+#include "ui/chromeos/network/network_connect.h"
-#include "ash/system/chromeos/network/network_state_notifier.h"
#include "base/bind.h"
#include "base/memory/scoped_ptr.h"
#include "base/strings/string_util.h"
@@ -21,11 +20,11 @@
#include "chromeos/network/network_profile_handler.h"
#include "chromeos/network/network_state.h"
#include "chromeos/network/network_state_handler.h"
-#include "grit/ash_resources.h"
-#include "grit/ash_strings.h"
+#include "grit/ui_chromeos_strings.h"
#include "third_party/cros_system_api/dbus/service_constants.h"
#include "ui/base/l10n/l10n_util.h"
#include "ui/base/resource/resource_bundle.h"
+#include "ui/chromeos/network/network_state_notifier.h"
#include "ui/message_center/message_center.h"
#include "ui/message_center/notification.h"
@@ -39,7 +38,7 @@ using chromeos::NetworkState;
using chromeos::NetworkStateHandler;
using chromeos::NetworkTypePattern;
-namespace ash {
+namespace ui {
namespace {
@@ -645,4 +644,4 @@ NetworkConnect::NetworkConnect() {
NetworkConnect::~NetworkConnect() {
}
-} // ash
+} // namespace ui
« no previous file with comments | « ui/chromeos/network/network_connect.h ('k') | ui/chromeos/network/network_state_notifier.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698