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

Unified Diff: chrome/browser/ui/webui/chromeos/login/network_dropdown.cc

Issue 351353004: chromeos: Move some network related UI in ui/chromeos/ (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix-build Created 6 years, 5 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: chrome/browser/ui/webui/chromeos/login/network_dropdown.cc
diff --git a/chrome/browser/ui/webui/chromeos/login/network_dropdown.cc b/chrome/browser/ui/webui/chromeos/login/network_dropdown.cc
index 19fe7ed6dd18f3791183a0d2d0b1aeeec4b62a19..15e51283c7102ebd23ddfcd5a2b5ec3bc8d06d17 100644
--- a/chrome/browser/ui/webui/chromeos/login/network_dropdown.cc
+++ b/chrome/browser/ui/webui/chromeos/login/network_dropdown.cc
@@ -6,8 +6,6 @@
#include <string>
-#include "ash/system/chromeos/network/network_icon.h"
-#include "ash/system/chromeos/network/network_icon_animation.h"
#include "base/time/time.h"
#include "base/values.h"
#include "chrome/browser/chromeos/login/ui/login_display_host.h"
@@ -16,6 +14,8 @@
#include "content/public/browser/web_ui.h"
#include "ui/base/models/menu_model.h"
#include "ui/base/webui/web_ui_util.h"
+#include "ui/chromeos/network/network_icon.h"
+#include "ui/chromeos/network/network_icon_animation.h"
#include "ui/gfx/font_list.h"
#include "ui/gfx/image/image.h"
#include "ui/gfx/image/image_skia.h"
@@ -128,7 +128,7 @@ NetworkDropdown::NetworkDropdown(Actor* actor,
}
NetworkDropdown::~NetworkDropdown() {
- ash::network_icon::NetworkIconAnimation::GetInstance()->RemoveObserver(this);
+ ui::network_icon::NetworkIconAnimation::GetInstance()->RemoveObserver(this);
if (NetworkHandler::IsInitialized()) {
NetworkHandler::Get()->network_state_handler()->RemoveObserver(
this, FROM_HERE);
@@ -182,13 +182,12 @@ void NetworkDropdown::SetNetworkIconAndText() {
base::string16 text;
gfx::ImageSkia icon_image;
bool animating = false;
- ash::network_icon::GetDefaultNetworkImageAndLabel(
- ash::network_icon::ICON_TYPE_LIST, &icon_image, &text, &animating);
+ ui::network_icon::GetDefaultNetworkImageAndLabel(
+ ui::network_icon::ICON_TYPE_LIST, &icon_image, &text, &animating);
if (animating) {
- ash::network_icon::NetworkIconAnimation::GetInstance()->AddObserver(this);
+ ui::network_icon::NetworkIconAnimation::GetInstance()->AddObserver(this);
} else {
- ash::network_icon::NetworkIconAnimation::GetInstance()->
- RemoveObserver(this);
+ ui::network_icon::NetworkIconAnimation::GetInstance()->RemoveObserver(this);
}
SkBitmap icon_bitmap = icon_image.GetRepresentation(
web_ui_->GetDeviceScaleFactor()).sk_bitmap();

Powered by Google App Engine
This is Rietveld 408576698