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

Unified Diff: ash/common/system/chromeos/network/network_list_md.cc

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_list_md.cc
diff --git a/ui/chromeos/network/network_list_md.cc b/ash/common/system/chromeos/network/network_list_md.cc
similarity index 97%
rename from ui/chromeos/network/network_list_md.cc
rename to ash/common/system/chromeos/network/network_list_md.cc
index c8d4b97da02965e50ac65204419cee4dc614ef53..c5a5bfbb4cdda6c4bfd8d277d733274f08e20412 100644
--- a/ui/chromeos/network/network_list_md.cc
+++ b/ash/common/system/chromeos/network/network_list_md.cc
@@ -2,10 +2,14 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "ui/chromeos/network/network_list_md.h"
+#include "ash/common/system/chromeos/network/network_list_md.h"
#include <stddef.h>
+#include "ash/common/system/chromeos/network/network_icon.h"
+#include "ash/common/system/chromeos/network/network_icon_animation.h"
+#include "ash/common/system/chromeos/network/network_info.h"
+#include "ash/common/system/chromeos/network/network_list_delegate.h"
#include "base/memory/ptr_util.h"
#include "chromeos/dbus/dbus_thread_manager.h"
#include "chromeos/dbus/power_manager/power_supply_properties.pb.h"
@@ -16,13 +20,9 @@
#include "chromeos/network/network_state_handler.h"
#include "chromeos/network/network_state_handler_observer.h"
#include "components/device_event_log/device_event_log.h"
-#include "grit/ui_chromeos_strings.h"
+#include "grit/ash_strings.h"
#include "ui/base/l10n/l10n_util.h"
#include "ui/base/resource/resource_bundle.h"
-#include "ui/chromeos/network/network_icon.h"
-#include "ui/chromeos/network/network_icon_animation.h"
-#include "ui/chromeos/network/network_info.h"
-#include "ui/chromeos/network/network_list_delegate.h"
#include "ui/gfx/color_palette.h"
#include "ui/gfx/font.h"
#include "ui/gfx/paint_vector_icon.h"
@@ -42,7 +42,7 @@ using chromeos::NetworkStateHandler;
using chromeos::ManagedNetworkConfigurationHandler;
using chromeos::NetworkTypePattern;
-namespace ui {
+namespace ash {
namespace {
@@ -500,4 +500,4 @@ void NetworkListViewMd::ButtonPressed(views::Button* sender,
}
}
-} // namespace ui
+} // namespace ash
« no previous file with comments | « ash/common/system/chromeos/network/network_list_md.h ('k') | ash/common/system/chromeos/network/network_list_view_base.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698