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

chrome/browser/chromeos/login/touch_login_view.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.
 
 #include "chrome/browser/chromeos/login/touch_login_view.h"
 
 #include "chrome/browser/renderer_host/render_widget_host_view_views.h"
 #include "chrome/browser/ui/touch/frame/keyboard_container_view.h"
 #include "chrome/browser/ui/views/tab_contents/tab_contents_view_touch.h"
 #include "chrome/browser/ui/views/dom_view.h"
+#include "chrome/common/chrome_notification_types.h"
 #include "content/browser/tab_contents/tab_contents.h"
 #include "content/common/notification_service.h"
 #include "ui/base/animation/slide_animation.h"
 #include "ui/gfx/transform.h"
 #include "views/controls/textfield/textfield.h"
 #include "views/widget/widget.h"
 
 namespace {
 
 const char kViewClassName[] = "browser/chromeos/login/TouchLoginView";
@@ skipping 25 matching lines @@
 }
 
 TouchLoginView::~TouchLoginView() {
 }
 
 void TouchLoginView::Init() {
   WebUILoginView::Init();
   InitVirtualKeyboard();
 
   registrar_.Add(this,
-                 NotificationType::FOCUS_CHANGED_IN_PAGE,
+                 content::NOTIFICATION_FOCUS_CHANGED_IN_PAGE,
                  NotificationService::AllSources());
   registrar_.Add(this,
-                 NotificationType::TAB_CONTENTS_DESTROYED,
+                 content::NOTIFICATION_TAB_CONTENTS_DESTROYED,
                  NotificationService::AllSources());
   registrar_.Add(this,
-                 NotificationType::HIDE_KEYBOARD_INVOKED,
+                 chrome::NOTIFICATION_HIDE_KEYBOARD_INVOKED,
                  NotificationService::AllSources());
   registrar_.Add(this,
-                 NotificationType::SET_KEYBOARD_HEIGHT_INVOKED,
+                 chrome::NOTIFICATION_SET_KEYBOARD_HEIGHT_INVOKED,
                  NotificationService::AllSources());
 }
 
 std::string TouchLoginView::GetClassName() const {
   return kViewClassName;
 }
 
 void TouchLoginView::FocusWillChange(views::View* focused_before,
                                      views::View* focused_now) {
   VirtualKeyboardType before = DecideKeyboardStateForView(focused_before);
@@ skipping 67 matching lines @@
   } else if (cname == RenderWidgetHostViewViews::kViewClassName) {
     TabContents* contents = webui_login_->tab_contents();
     bool* editable = contents ? GetFocusedStateAccessor()->GetProperty(
         contents->property_bag()) : NULL;
     if (editable && *editable)
       return GENERIC;
   }
   return NONE;
 }
 
-void TouchLoginView::Observe(NotificationType type,
+void TouchLoginView::Observe(int type,
                              const NotificationSource& source,
                              const NotificationDetails& details) {
-  if (type == NotificationType::FOCUS_CHANGED_IN_PAGE) {
+  if (type == content::NOTIFICATION_FOCUS_CHANGED_IN_PAGE) {
     // Only modify the keyboard state if the currently active tab sent the
     // notification.
     const TabContents* current_tab = webui_login_->tab_contents();
     TabContents* source_tab = Source<TabContents>(source).ptr();
     const bool editable = *Details<const bool>(details).ptr();
 
     if (current_tab == source_tab && TabContentsHasFocus(source_tab))
       UpdateKeyboardAndLayout(editable);
 
     // Save the state of the focused field so that the keyboard visibility
     // can be determined after tab switching.
     GetFocusedStateAccessor()->SetProperty(
         source_tab->property_bag(), editable);
-  } else if (type == NotificationType::TAB_CONTENTS_DESTROYED) {
+  } else if (type == content::NOTIFICATION_TAB_CONTENTS_DESTROYED) {
     GetFocusedStateAccessor()->DeleteProperty(
         Source<TabContents>(source).ptr()->property_bag());
-  } else if (type == NotificationType::HIDE_KEYBOARD_INVOKED) {
+  } else if (type == chrome::NOTIFICATION_HIDE_KEYBOARD_INVOKED) {
     UpdateKeyboardAndLayout(false);
-  } else if (type == NotificationType::SET_KEYBOARD_HEIGHT_INVOKED) {
+  } else if (type == chrome::NOTIFICATION_SET_KEYBOARD_HEIGHT_INVOKED) {
     // TODO(penghuang) Allow extension conrtol the virtual keyboard directly
     // instead of using Notification.
     int height = *(Details<int>(details).ptr());
     if (height != keyboard_height_) {
       DCHECK_GE(height, 0) << "Height of the keyboard is less than 0.";
       DCHECK_LE(height, View::height()) << "Height of the keyboard is greater "
           "than the height of containing view.";
       keyboard_height_ = height;
       Layout();
     }
@@ skipping 12 matching lines @@
 void TouchLoginView::AnimationEnded(const ui::Animation* animation) {
   if (keyboard_showing_) {
     Layout();
   } else {
     // Notify the keyboard that it is hidden now.
     keyboard_->SetVisible(false);
   }
 }
 
 }  // namespace chromeos