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

Unified Diff: ash/common/system/user/user_card_view.cc

Issue 2125373002: mash: Migrate ash/system/user to ash/common. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Sync and rebase. Created 4 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: ash/common/system/user/user_card_view.cc
diff --git a/ash/system/user/user_card_view.cc b/ash/common/system/user/user_card_view.cc
similarity index 99%
rename from ash/system/user/user_card_view.cc
rename to ash/common/system/user/user_card_view.cc
index 8356091583d4b6df6590ce453d6f0044393866e8..77e2280231a945b43afb62bdf0d2539a7151f32c 100644
--- a/ash/system/user/user_card_view.cc
+++ b/ash/common/system/user/user_card_view.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "ash/system/user/user_card_view.h"
+#include "ash/common/system/user/user_card_view.h"
#include <algorithm>
#include <vector>
@@ -39,7 +39,7 @@
#include "ui/views/layout/box_layout.h"
#if defined(OS_CHROMEOS)
-#include "ash/ash_view_ids.h"
+#include "ash/common/ash_view_ids.h"
#include "ash/common/media_delegate.h"
#include "ash/common/system/chromeos/media_security/media_capture_observer.h"
#include "ui/views/controls/image_view.h"

Powered by Google App Engine
This is Rietveld 408576698