chrome/browser/ui/ash/system_tray_delegate_chromeos.cc - Issue 2734733002: Revert "chromeos: Move files in //ash/common to //ash, part 3" - Code Review

Chromium Code Reviews

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

(1532)

My Issues | Starred Open | Closed | All

Unified Diff: chrome/browser/ui/ash/system_tray_delegate_chromeos.cc

Issue 2734733002: Revert "chromeos: Move files in //ash/common to //ash, part 3" (Closed)

Patch Set: Created 3 years, 9 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

« no previous file with comments | « chrome/browser/ui/ash/system_tray_delegate_chromeos.h ('k') | chrome/browser/ui/ash/system_tray_tray_cast_browsertest_media_router_chromeos.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/ash/system_tray_delegate_chromeos.cc

diff --git a/chrome/browser/ui/ash/system_tray_delegate_chromeos.cc b/chrome/browser/ui/ash/system_tray_delegate_chromeos.cc

index cf665e793d4343786ab5d2649bf2872ad27ad86c..8ece5852d70e8414f758b3d2a72cfcaa9e3fb0f1 100644

--- a/chrome/browser/ui/ash/system_tray_delegate_chromeos.cc

+++ b/chrome/browser/ui/ash/system_tray_delegate_chromeos.cc

@@ -13,8 +13,9 @@

#include <utility>

#include <vector>

-#include "ash/login_status.h"

-#include "ash/shell_delegate.h"

+#include "ash/common/login_status.h"

+#include "ash/common/shell_delegate.h"

+#include "ash/common/wm_shell.h"

#include "ash/system/bluetooth/bluetooth_observer.h"

#include "ash/system/date/clock_observer.h"

#include "ash/system/ime/ime_observer.h"

@@ -24,7 +25,6 @@

#include "ash/system/tray/system_tray_notifier.h"

#include "ash/system/tray_accessibility.h"

#include "ash/system/user/user_observer.h"

-#include "ash/wm_shell.h"

#include "base/bind_helpers.h"

#include "base/callback.h"

#include "base/logging.h"

« no previous file with comments | « chrome/browser/ui/ash/system_tray_delegate_chromeos.h ('k') | chrome/browser/ui/ash/system_tray_tray_cast_browsertest_media_router_chromeos.cc » ('j') | no next file with comments »

Powered by Google App Engine

This is Rietveld 408576698