Revert 253010 "Revert 251563 "Move browser initiated navigation ..."

trunk/src/content/renderer/notification_provider.cc

 // Copyright (c) 2012 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 "content/renderer/notification_provider.h"
 
 #include "base/strings/string_util.h"
 #include "content/common/desktop_notification_messages.h"
-#include "content/common/view_messages.h"
+#include "content/common/frame_messages.h"
 #include "content/renderer/render_view_impl.h"
 #include "third_party/WebKit/public/platform/WebURL.h"
 #include "third_party/WebKit/public/web/WebDocument.h"
 #include "third_party/WebKit/public/web/WebFrame.h"
 #include "third_party/WebKit/public/web/WebNotificationPermissionCallback.h"
 #include "third_party/WebKit/public/web/WebUserGestureIndicator.h"
 #include "third_party/WebKit/public/web/WebView.h"
 
 using blink::WebDocument;
 using blink::WebNotification;
@@ skipping 74 matching lines @@
   IPC_BEGIN_MESSAGE_MAP(NotificationProvider, message)
     IPC_MESSAGE_HANDLER(DesktopNotificationMsg_PostDisplay, OnDisplay);
     IPC_MESSAGE_HANDLER(DesktopNotificationMsg_PostError, OnError);
     IPC_MESSAGE_HANDLER(DesktopNotificationMsg_PostClose, OnClose);
     IPC_MESSAGE_HANDLER(DesktopNotificationMsg_PostClick, OnClick);
     IPC_MESSAGE_HANDLER(DesktopNotificationMsg_PermissionRequestDone,
                         OnPermissionRequestComplete);
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
 
-  if (message.type() == ViewMsg_Navigate::ID)
+  if (message.type() == FrameMsg_Navigate::ID)
     OnNavigate();  // Don't want to swallow the message.
 
   return handled;
 }
 
 void NotificationProvider::OnDisplay(int id) {
   WebNotification notification;
   bool found = manager_.GetNotification(id, &notification);
   // |found| may be false if the WebNotification went out of scope in
   // the page before it was actually displayed to the user.
@@ skipping 35 matching lines @@
   DCHECK(callback);
   callback->permissionRequestComplete();
   manager_.OnPermissionRequestComplete(id);
 }
 
 void NotificationProvider::OnNavigate() {
   manager_.Clear();
 }
 
 }  // namespace content