InstantExtended: Add js api for custom logo.

chrome/browser/instant/instant_loader.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 "chrome/browser/instant/instant_loader.h"
 
 #include "chrome/browser/content_settings/tab_specific_content_settings.h"
 #include "chrome/browser/instant/instant_loader_delegate.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/thumbnails/thumbnail_tab_helper.h"
@@ skipping 72 matching lines @@
       const GURL& validated_url,
       bool is_main_frame,
       content::RenderViewHost* render_view_host) OVERRIDE;
   virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
 
  private:
   // Message from renderer indicating the page has suggestions.
   void OnSetSuggestions(int page_id,
                         const std::vector<InstantSuggestion>& suggestions);
 
+  // Message from renderer indicating whether the page has a custom logo to
+  // display on the NTP.
+  void OnSetHasCustomLogo(int page_id, bool has_logo);
+
   // Message from the renderer determining whether it supports the Instant API.
   void OnInstantSupportDetermined(int page_id, bool result);
 
   // Message from the renderer requesting the preview be resized.
   void OnSetInstantPreviewHeight(int page_id,
                                  int height,
                                  InstantSizeUnits units);
 
   void CommitFromPointerReleaseIfNecessary();
   void MaybeSetAndNotifyInstantSupportDetermined(bool supports_instant);
@@ skipping 90 matching lines @@
       Send(new ChromeViewMsg_DetermineIfPageSupportsInstant(routing_id()));
     loader_->loader_delegate_->InstantLoaderPreviewLoaded(loader_);
   }
 }
 
 bool InstantLoader::WebContentsDelegateImpl::OnMessageReceived(
     const IPC::Message& message) {
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP(WebContentsDelegateImpl, message)
     IPC_MESSAGE_HANDLER(ChromeViewHostMsg_SetSuggestions, OnSetSuggestions)
+    IPC_MESSAGE_HANDLER(ChromeViewHostMsg_SetHasCustomLogo,
+                        OnSetHasCustomLogo);
     IPC_MESSAGE_HANDLER(ChromeViewHostMsg_InstantSupportDetermined,
                         OnInstantSupportDetermined)
     IPC_MESSAGE_HANDLER(ChromeViewHostMsg_SetInstantPreviewHeight,
                         OnSetInstantPreviewHeight);
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
   return handled;
 }
 
 void InstantLoader::WebContentsDelegateImpl::OnSetSuggestions(
     int page_id,
     const std::vector<InstantSuggestion>& suggestions) {
   DCHECK(loader_->preview_contents());
   DCHECK(loader_->preview_contents_->web_contents());
   content::NavigationEntry* entry = loader_->preview_contents_->web_contents()->
                                         GetController().GetActiveEntry();
   if (entry && page_id == entry->GetPageID()) {
     MaybeSetAndNotifyInstantSupportDetermined(true);
     loader_->loader_delegate_->SetSuggestions(loader_, suggestions);
   }
 }
 
+// Message from renderer indicating whether the page has a custom logo to
+// display on the NTP.
+void InstantLoader::WebContentsDelegateImpl::OnSetHasCustomLogo(
+    int page_id,
+    bool has_logo) {
+  DCHECK(loader_->preview_contents());
+  DCHECK(loader_->preview_contents_->web_contents());
+  content::NavigationEntry* entry = loader_->preview_contents_->web_contents()->
+                                        GetController().GetActiveEntry();
+  if (entry && page_id == entry->GetPageID()) {
+    MaybeSetAndNotifyInstantSupportDetermined(true);
+    loader_->loader_delegate_->SetHasCustomLogo(loader_, has_logo);
+  }
+}
+
 void InstantLoader::WebContentsDelegateImpl::OnInstantSupportDetermined(
     int page_id,
     bool result) {
   DCHECK(loader_->preview_contents());
   DCHECK(loader_->preview_contents_->web_contents());
   content::NavigationEntry* entry = loader_->preview_contents_->web_contents()->
                                         GetController().GetActiveEntry();
   if (entry && page_id == entry->GetPageID())
     MaybeSetAndNotifyInstantSupportDetermined(result);
 }
@@ skipping 227 matching lines @@
                                            content::WebContents* new_contents) {
   DCHECK_EQ(old_contents, preview_contents_->web_contents());
   CleanupPreviewContents();
   // We release here without deleting so that the caller still has the
   // responsibility for deleting the TabContents.
   ignore_result(preview_contents_.release());
   preview_contents_.reset(TabContents::FromWebContents(new_contents));
   SetupPreviewContents();
   loader_delegate_->SwappedTabContents(this);
 }