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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ash/system/tray/system_tray.cc

Issue 12313118: Refactor: Shelf Widget (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: formatting and moved a couple unit tests Created 7 years, 10 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
« ash/shelf/shelf_layout_manager.cc ('K') | « ash/system/status_area_widget_delegate.h ('k') | ash/system/tray/system_tray_item.h » ('j') | ui/compositor/layer_animation_element.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/system/tray/system_tray.cc
diff --git a/ash/system/tray/system_tray.cc b/ash/system/tray/system_tray.cc
index 6ee1fa40c12a0b16858b625746fa73313fb402f0..6d95c7d3990364c80bd24566d3b51020366e20c2 100644
--- a/ash/system/tray/system_tray.cc
+++ b/ash/system/tray/system_tray.cc
@@ -5,6 +5,7 @@
#include "ash/system/tray/system_tray.h"
#include "ash/ash_switches.h"
+#include "ash/shelf/shelf_layout_manager.h"
#include "ash/shell.h"
#include "ash/shell/panel_window.h"
#include "ash/shell_window_ids.h"
@@ -32,7 +33,6 @@
#include "ash/system/tray_update.h"
#include "ash/system/user/login_status.h"
#include "ash/system/user/tray_user.h"
-#include "ash/wm/shelf_layout_manager.h"
#include "base/command_line.h"
#include "base/logging.h"
#include "base/timer.h"
« ash/shelf/shelf_layout_manager.cc ('K') | « ash/system/status_area_widget_delegate.h ('k') | ash/system/tray/system_tray_item.h » ('j') | ui/compositor/layer_animation_element.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698