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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ash/system/ime/tray_ime.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/shell_window_ids.h ('k') | ash/system/session_length_limit/tray_session_length_limit.cc » ('j') | ui/compositor/layer_animation_element.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/system/ime/tray_ime.cc
diff --git a/ash/system/ime/tray_ime.cc b/ash/system/ime/tray_ime.cc
index c9a92bb6c1c788831b16fb1372bf79189874a64a..9a9aafc2bc0908e1cfbf93432f3399f55afeb0d6 100644
--- a/ash/system/ime/tray_ime.cc
+++ b/ash/system/ime/tray_ime.cc
@@ -7,6 +7,8 @@
#include <vector>
#include "ash/root_window_controller.h"
+#include "ash/shelf/shelf_layout_manager.h"
+#include "ash/shelf/shelf_widget.h"
#include "ash/shell.h"
#include "ash/system/tray/hover_highlight_view.h"
#include "ash/system/tray/system_tray.h"
@@ -17,7 +19,7 @@
#include "ash/system/tray/tray_item_more.h"
#include "ash/system/tray/tray_item_view.h"
#include "ash/system/tray/tray_notification_view.h"
-#include "ash/wm/shelf_layout_manager.h"
+#include "ash/system/tray/tray_views.h"
#include "base/logging.h"
#include "base/timer.h"
#include "base/utf_string_conversions.h"
« ash/shelf/shelf_layout_manager.cc ('K') | « ash/shell_window_ids.h ('k') | ash/system/session_length_limit/tray_session_length_limit.cc » ('j') | ui/compositor/layer_animation_element.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698