1 files changed, 4 insertions, 11 deletions
diff --git a/chromium/ui/message_center/ui_controller.h b/chromium/ui/message_center/ui_controller.h
index bbe26caa972..582ad520d4e 100644
--- a/chromium/ui/message_center/ui_controller.h
+++ b/chromium/ui/message_center/ui_controller.h
@@ -5,13 +5,12 @@
 #ifndef UI_MESSAGE_CENTER_UI_CONTROLLER_H_
 #define UI_MESSAGE_CENTER_UI_CONTROLLER_H_
 
-#include "base/cancelable_callback.h"
 #include "base/macros.h"
 #include "base/observer_list.h"
 #include "base/strings/string16.h"
 #include "ui/message_center/message_center_export.h"
 #include "ui/message_center/message_center_observer.h"
-#include "ui/message_center/notifier_id.h"
+#include "ui/message_center/public/cpp/notifier_id.h"
 #include "ui/message_center/ui_delegate.h"
 
 namespace message_center {
@@ -53,10 +52,8 @@ class MESSAGE_CENTER_EXPORT UiController : public MessageCenterObserver {
   bool message_center_visible() { return message_center_visible_; }
   bool popups_visible() { return popups_visible_; }
   UiDelegate* delegate() { return delegate_; }
-  const message_center::MessageCenter* message_center() const {
-    return message_center_;
-  }
-  message_center::MessageCenter* message_center() { return message_center_; }
+  const MessageCenter* message_center() const { return message_center_; }
+  MessageCenter* message_center() { return message_center_; }
 
   // Overridden from MessageCenterObserver:
   void OnNotificationAdded(const std::string& notification_id) override;
@@ -77,15 +74,11 @@ class MESSAGE_CENTER_EXPORT UiController : public MessageCenterObserver {
   void NotifyUiControllerChanged();
   void HidePopupBubbleInternal();
 
-  message_center::MessageCenter* message_center_;
+  MessageCenter* message_center_;
   bool message_center_visible_ = false;
   bool popups_visible_ = false;
   UiDelegate* delegate_;
 
-#if defined(OS_CHROMEOS)
-  std::unique_ptr<base::CancelableClosure> hide_empty_message_center_callback_;
-#endif
-
   DISALLOW_COPY_AND_ASSIGN(UiController);
 };