3 files changed, 7 insertions, 5 deletions
diff --git a/chrome/browser/chromeos/frame/layout_mode_button.cc b/chrome/browser/chromeos/frame/layout_mode_button.cc
index ffc2f41..be24ffa 100644
--- a/chrome/browser/chromeos/frame/layout_mode_button.cc
+++ b/chrome/browser/chromeos/frame/layout_mode_button.cc
@@ -7,6 +7,7 @@
 #include "base/logging.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/chromeos/wm_ipc.h"
+#include "chrome/common/chrome_notification_types.h"
 #include "content/common/notification_details.h"
 #include "content/common/notification_source.h"
 #include "grit/generated_resources.h"
@@ -42,17 +43,17 @@ bool LayoutModeButton::HitTest(const gfx::Point& l) const {
   return ImageButton::HitTest(point);
 }
 
-void LayoutModeButton::Observe(NotificationType type,
+void LayoutModeButton::Observe(int type,
                                const NotificationSource& source,
                                const NotificationDetails& details) {
-  DCHECK(type == NotificationType::LAYOUT_MODE_CHANGED);
+  DCHECK(type == chrome::NOTIFICATION_LAYOUT_MODE_CHANGED);
   UpdateForCurrentLayoutMode();
 }
 
 void LayoutModeButton::Init() {
   WmIpc* wm_ipc = WmIpc::instance();
   registrar_.Add(this,
-                 NotificationType::LAYOUT_MODE_CHANGED,
+                 chrome::NOTIFICATION_LAYOUT_MODE_CHANGED,
                  Source<WmIpc>(wm_ipc));
   UpdateForCurrentLayoutMode();
 }
diff --git a/chrome/browser/chromeos/frame/layout_mode_button.h b/chrome/browser/chromeos/frame/layout_mode_button.h
index 3e7e98d..82248a9 100644
--- a/chrome/browser/chromeos/frame/layout_mode_button.h
+++ b/chrome/browser/chromeos/frame/layout_mode_button.h
@@ -30,7 +30,7 @@ class LayoutModeButton : public views::ImageButton,
   virtual bool HitTest(const gfx::Point& l) const OVERRIDE;
 
   // NotificationObserver implementation.
-  virtual void Observe(NotificationType type,
+  virtual void Observe(int type,
                        const NotificationSource& source,
                        const NotificationDetails& details) OVERRIDE;
 
diff --git a/chrome/browser/chromeos/frame/panel_controller.cc b/chrome/browser/chromeos/frame/panel_controller.cc
index 0150a09..66b3ffb 100644
--- a/chrome/browser/chromeos/frame/panel_controller.cc
+++ b/chrome/browser/chromeos/frame/panel_controller.cc
@@ -20,6 +20,7 @@
 #include "base/time.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/chromeos/wm_ipc.h"
+#include "chrome/common/chrome_notification_types.h"
 #include "content/common/notification_service.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
@@ -389,7 +390,7 @@ bool PanelController::PanelClientEvent(GdkEventClient* event) {
       expanded_ = new_state;
       State state = new_state ? EXPANDED : MINIMIZED;
       NotificationService::current()->Notify(
-          NotificationType::PANEL_STATE_CHANGED,
+          chrome::NOTIFICATION_PANEL_STATE_CHANGED,
           Source<PanelController>(this),
           Details<State>(&state));
     }