Update Chromium to branch 1650 (31.0.1650.63)

Change-Id: I57d8c832eaec1eb2364e0a8e7352a6dd354db99f
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>

1 files changed, 10 insertions, 0 deletions

diff --git a/chromium/content/public/browser/notification_types.h b/chromium/content/public/browser/notification_types.h
index db8654c3e9e..69eae612df2 100644
--- a/chromium/content/public/browser/notification_types.h
+++ b/chromium/content/public/browser/notification_types.h
@@ -89,17 +89,20 @@ enum NotificationType {
   // Source<NavigationController> corresponding to the tab in which the load
   // occurred.  Details in the form of a LoadFromMemoryCacheDetails object
   // are provided.
+  // DEPRECATED: Use WebContentsObserver::DidLoadResourceFromMemoryCache()
   NOTIFICATION_LOAD_FROM_MEMORY_CACHE,
 
   // A response has been received for a resource request.  The source will be
   // a Source<WebContents> corresponding to the tab in which the request was
   // issued.  Details in the form of a ResourceRequestDetails object are
   // provided.
+  // DEPRECATED: Use WebContentsObserver::DidGetResourceResponseStart()
   NOTIFICATION_RESOURCE_RESPONSE_STARTED,
 
   // A redirect was received while requesting a resource.  The source will be
   // a Source<WebContents> corresponding to the tab in which the request was
   // issued.  Details in the form of a ResourceRedirectDetails are provided.
+  // DEPRECATED: Use WebContentsObserver::DidGetRedirectForResourceRequest()
   NOTIFICATION_RESOURCE_RECEIVED_REDIRECT,
 
   // WebContents ---------------------------------------------------------------
@@ -109,6 +112,7 @@ enum NotificationType {
   // the WebContents.  A WEB_CONTENTS_DISCONNECTED notification is
   // guaranteed before the source pointer becomes junk.  No details are
   // expected.
+  // DEPRECATED: Use WebContentsObserver::RenderViewReady()
   NOTIFICATION_WEB_CONTENTS_CONNECTED,
 
   // This notification is sent when a WebContents swaps its render view host
@@ -117,11 +121,16 @@ enum NotificationType {
   // NOTIFICATION_WEB_CONTENTS_DISCONNECTED notification is guaranteed before
   // the source pointer becomes junk.  Details are the RenderViewHost that
   // has been replaced, or NULL if the old RVH was shut down.
+  // DEPRECATED: Use WebContentsObserver::RenderViewHostSwapped()
   NOTIFICATION_WEB_CONTENTS_SWAPPED,
 
   // This message is sent after a WebContents is disconnected from the
   // renderer process.  The source is a Source<WebContents> with a pointer to
   // the WebContents (the pointer is usable).  No details are expected.
+  // DEPRECATED: This is fired in two situations: when the render process
+  // crashes, in which case use WebContentsObserver::RenderProcessGone, and when
+  // the WebContents is being torn down, in which case use
+  // WebContentsObserver::WebContentsDestroyed()
   NOTIFICATION_WEB_CONTENTS_DISCONNECTED,
 
   // This notification is sent after WebContents' title is updated. The source
@@ -138,6 +147,7 @@ enum NotificationType {
   // object holding a reference to a WebContents can listen to that
   // notification to properly reset the reference. The source is a
   // Source<WebContents>.
+  // DEPRECATED: Use WebContentsObserver::WebContentsDestroyed()
   NOTIFICATION_WEB_CONTENTS_DESTROYED,
 
   // A RenderViewHost was created for a WebContents. The source is the