Build fixes for the linux touch build. The render_widget_host_view_views_touch.cc was checked in

due to a stupid global find and replace :( Reverting to the revision before my CL. 
The other changes are basically fixing the notification names.

BUG=none
TEST=it compiles
TBR=joi
Review URL: http://codereview.chromium.org/7334004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@91987 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 14 insertions, 13 deletions

diff --git a/chrome/browser/ui/touch/frame/touch_browser_frame_view.cc b/chrome/browser/ui/touch/frame/touch_browser_frame_view.cc
index 897d9cf..b1ae5b4 100644
--- a/chrome/browser/ui/touch/frame/touch_browser_frame_view.cc
+++ b/chrome/browser/ui/touch/frame/touch_browser_frame_view.cc
@@ -12,6 +12,7 @@
 #include "chrome/browser/ui/touch/frame/keyboard_container_view.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
 #include "chrome/browser/ui/views/tab_contents/tab_contents_view_touch.h"
+#include "chrome/common/chrome_notification_types.h"
 #include "content/browser/renderer_host/render_view_host.h"
 #include "content/browser/tab_contents/navigation_controller.h"
 #include "content/browser/tab_contents/tab_contents.h"
@@ -62,22 +63,22 @@ TouchBrowserFrameView::TouchBrowserFrameView(BrowserFrame* frame,
       focus_listener_added_(false),
       keyboard_(NULL) {
   registrar_.Add(this,
-                 chrome::NAV_ENTRY_COMMITTED,
+                 content::NOTIFICATION_NAV_ENTRY_COMMITTED,
                  NotificationService::AllSources());
   registrar_.Add(this,
-                 chrome::FOCUS_CHANGED_IN_PAGE,
+                 content::NOTIFICATION_FOCUS_CHANGED_IN_PAGE,
                  NotificationService::AllSources());
   registrar_.Add(this,
-                 chrome::TAB_CONTENTS_DESTROYED,
+                 content::NOTIFICATION_TAB_CONTENTS_DESTROYED,
                  NotificationService::AllSources());
   registrar_.Add(this,
-                 chrome::HIDE_KEYBOARD_INVOKED,
+                 chrome::NOTIFICATION_HIDE_KEYBOARD_INVOKED,
                  NotificationService::AllSources());
   registrar_.Add(this,
-                 chrome::SET_KEYBOARD_HEIGHT_INVOKED,
+                 chrome::NOTIFICATION_SET_KEYBOARD_HEIGHT_INVOKED,
                  NotificationService::AllSources());
   registrar_.Add(this,
-                 chrome::EDITABLE_ELEMENT_TOUCHED,
+                 chrome::NOTIFICATION_EDITABLE_ELEMENT_TOUCHED,
                  NotificationService::AllSources());
 
   browser_view->browser()->tabstrip_model()->AddObserver(this);
@@ -264,7 +265,7 @@ void TouchBrowserFrameView::Observe(int type,
                                     const NotificationSource& source,
                                     const NotificationDetails& details) {
   Browser* browser = browser_view()->browser();
-  if (type == chrome::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 = browser->GetSelectedTabContents();
@@ -278,7 +279,7 @@ void TouchBrowserFrameView::Observe(int type,
     // can be determined after tab switching.
     GetFocusedStateAccessor()->SetProperty(
         source_tab->property_bag(), editable);
-  } else if (type == chrome::NAV_ENTRY_COMMITTED) {
+  } else if (type == content::NOTIFICATION_NAV_ENTRY_COMMITTED) {
     NavigationController* controller =
         Source<NavigationController>(source).ptr();
     Browser* source_browser = Browser::GetBrowserForController(
@@ -299,12 +300,12 @@ void TouchBrowserFrameView::Observe(int type,
     }
     if (source_browser == browser)
       UpdateKeyboardAndLayout(keyboard_type == GENERIC);
-  } else if (type == chrome::TAB_CONTENTS_DESTROYED) {
+  } else if (type == content::NOTIFICATION_TAB_CONTENTS_DESTROYED) {
     GetFocusedStateAccessor()->DeleteProperty(
         Source<TabContents>(source).ptr()->property_bag());
-  } else if (type == chrome::PREF_CHANGED) {
+  } else if (type == chrome::NOTIFICATION_PREF_CHANGED) {
     OpaqueBrowserFrameView::Observe(type, source, details);
-  } else if (type == chrome::HIDE_KEYBOARD_INVOKED) {
+  } else if (type == chrome::NOTIFICATION_HIDE_KEYBOARD_INVOKED) {
     TabContents* tab_contents =
         browser_view()->browser()->GetSelectedTabContents();
     if (tab_contents) {
@@ -312,7 +313,7 @@ void TouchBrowserFrameView::Observe(int type,
                                              false);
     }
     UpdateKeyboardAndLayout(false);
-  } else if (type == chrome::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 = *reinterpret_cast<int*>(details.map_key());
@@ -323,7 +324,7 @@ void TouchBrowserFrameView::Observe(int type,
       keyboard_height_ = height;
       parent()->Layout();
     }
-  } else if (type == chrome::EDITABLE_ELEMENT_TOUCHED) {
+  } else if (type == chrome::NOTIFICATION_EDITABLE_ELEMENT_TOUCHED) {
     UpdateKeyboardAndLayout(true);
   }
 }