Moving notification types which are chrome specific to a new header file chrome_notification_type...

chrome/browser/chromeos/notifications/notification_panel.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Draws the view for the balloons.
 
 #include "chrome/browser/chromeos/notifications/notification_panel.h"
 
 #include <algorithm>
 
 #include "chrome/browser/chromeos/notifications/balloon_collection_impl.h"
 #include "chrome/browser/chromeos/notifications/balloon_view.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"
 #include "third_party/cros/chromeos_wm_ipc_enums.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/canvas.h"
 #include "views/background.h"
 #include "views/controls/native/native_view_host.h"
 #include "views/controls/scroll_view.h"
@@ skipping 436 matching lines @@
     // so that window_contents does not get deleted when detached.
     g_object_ref(viewport_widget->GetNativeView());
     native->Attach(viewport_widget->GetNativeView());
 
     UnregisterNotification();
     panel_controller_.reset(
         new PanelController(this, GTK_WINDOW(panel_widget_->GetNativeView())));
     panel_controller_->Init(false /* don't focus when opened */,
                             gfx::Rect(0, 0, kBalloonMinWidth, 1), 0,
                             WM_IPC_PANEL_USER_RESIZE_VERTICALLY);
-    registrar_.Add(this, NotificationType::PANEL_STATE_CHANGED,
+    registrar_.Add(this, chrome::NOTIFICATION_PANEL_STATE_CHANGED,
                    Source<PanelController>(panel_controller_.get()));
   }
   panel_widget_->Show();
 }
 
 void NotificationPanel::Hide() {
   balloon_container_->DismissAllNonSticky();
   if (panel_widget_) {
     container_host_->GetRootView()->RemoveChildView(balloon_container_.get());
 
@@ skipping 129 matching lines @@
 }
 
 void NotificationPanel::ActivatePanel() {
   if (active_)
     active_->Activated();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // NotificationObserver overrides.
 
-void NotificationPanel::Observe(NotificationType type,
+void NotificationPanel::Observe(int type,
                                 const NotificationSource& source,
                                 const NotificationDetails& details) {
-  DCHECK(type == NotificationType::PANEL_STATE_CHANGED);
+  DCHECK(type == chrome::NOTIFICATION_PANEL_STATE_CHANGED);
   PanelController::State* state =
       reinterpret_cast<PanelController::State*>(details.map_key());
   switch (*state) {
     case PanelController::EXPANDED:
       // Geting expanded in STICKY_AND_NEW or in KEEP_SIZE state means
       // that a new notification is added, so just leave the
       // state. Otherwise, expand to full.
       if (state_ != STICKY_AND_NEW && state_ != KEEP_SIZE)
         SET_STATE(FULL);
       // When the panel is to be expanded, we either show all, or
@@ skipping 47 matching lines @@
 
   scroll_view_.reset(new views::ScrollView());
   scroll_view_->set_focusable(true);
   scroll_view_->set_parent_owned(false);
   scroll_view_->set_background(
       views::Background::CreateSolidBackground(SK_ColorWHITE));
 }
 
 void NotificationPanel::UnregisterNotification() {
   if (panel_controller_.get())
-    registrar_.Remove(this, NotificationType::PANEL_STATE_CHANGED,
+    registrar_.Remove(this, chrome::NOTIFICATION_PANEL_STATE_CHANGED,
                       Source<PanelController>(panel_controller_.get()));
 }
 
 void NotificationPanel::ScrollBalloonToVisible(Balloon* balloon) {
   BalloonViewImpl* view = GetBalloonViewOf(balloon);
   if (!view->closed()) {
     // We can't use View::ScrollRectToVisible because the viewport is not
     // ancestor of the BalloonViewImpl.
     // Use Widget's coordinate which is same as viewport's coordinates.
     gfx::Point p(0, 0);
@@ skipping 165 matching lines @@
                                   &origin);
   return rect.Contains(gfx::Rect(origin, view->size()));
 }
 
 
 bool NotificationPanelTester::IsActive(const BalloonViewImpl* view) const {
   return panel_->active_ == view;
 }
 
 }  // namespace chromeos