Remove history dependency from content.

chrome/browser/history/history_tab_helper.cc

Index: chrome/browser/history/history_tab_helper.cc
===================================================================
--- chrome/browser/history/history_tab_helper.cc	(revision 0)
+++ chrome/browser/history/history_tab_helper.cc	(revision 0)
@@ -0,0 +1,158 @@
+// 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/history/history_tab_helper.h"
+
+#include "chrome/browser/history/history.h"
+#include "chrome/browser/history/top_sites.h"
+#include "chrome/browser/profiles/profile.h"
+#include "chrome/common/render_messages.h"
+#include "content/browser/tab_contents/navigation_controller.h"
+#include "content/browser/tab_contents/navigation_entry.h"
+#include "content/browser/tab_contents/tab_contents.h"
+#include "content/browser/tab_contents/tab_contents_delegate.h"
+#include "content/browser/tab_contents/title_updated_details.h"
+#include "content/common/notification_service.h"
+#include "content/common/view_messages.h"
+
+HistoryTabHelper::HistoryTabHelper(TabContents* tab_contents)
+    : TabContentsObserver(tab_contents),
+      received_page_title_(false) {
+  registrar_.Add(this, NotificationType::TAB_CONTENTS_TITLE_UPDATED,
+                 Source<TabContents>(tab_contents));
+}
+
+HistoryTabHelper::~HistoryTabHelper() {
+}
+
+void HistoryTabHelper::UpdateHistoryForNavigation(
+    scoped_refptr<history::HistoryAddPageArgs> add_page_args) {
+  HistoryService* hs = GetHistoryService();
+  if (hs)
+    GetHistoryService()->AddPage(*add_page_args);
+}
+
+void HistoryTabHelper::UpdateHistoryPageTitle(const NavigationEntry& entry) {
+  HistoryService* hs = GetHistoryService();
+  if (hs)
+    hs->SetPageTitle(entry.virtual_url(), entry.title());
+}
+
+scoped_refptr<history::HistoryAddPageArgs>
+HistoryTabHelper::CreateHistoryAddPageArgs(
+    const GURL& virtual_url,
+    const NavigationController::LoadCommittedDetails& details,
+    const ViewHostMsg_FrameNavigate_Params& params) {
+  scoped_refptr<history::HistoryAddPageArgs> add_page_args(
+      new history::HistoryAddPageArgs(
+          params.url, base::Time::Now(), tab_contents(), params.page_id,
+          params.referrer, params.redirects, params.transition,
+          history::SOURCE_BROWSED, details.did_replace_entry));
+  if (PageTransition::IsMainFrame(params.transition) &&
+      virtual_url != params.url) {
+    // Hack on the "virtual" URL so that it will appear in history. For some
+    // types of URLs, we will display a magic URL that is different from where
+    // the page is actually navigated. We want the user to see in history what
+    // they saw in the URL bar, so we add the virtual URL as a redirect.  This
+    // only applies to the main frame, as the virtual URL doesn't apply to
+    // sub-frames.
+    add_page_args->url = virtual_url;
+    if (!add_page_args->redirects.empty())
+      add_page_args->redirects.back() = virtual_url;
+  }
+  return add_page_args;
+}
+
+bool HistoryTabHelper::OnMessageReceived(const IPC::Message& message) {
+  bool handled = true;
+  IPC_BEGIN_MESSAGE_MAP(HistoryTabHelper, message)
+    IPC_MESSAGE_HANDLER(ViewHostMsg_PageContents, OnPageContents)
+    IPC_MESSAGE_HANDLER(ViewHostMsg_Thumbnail, OnThumbnail)
+    IPC_MESSAGE_UNHANDLED(handled = false)
+  IPC_END_MESSAGE_MAP()
+
+  return handled;
+}
+
+void HistoryTabHelper::DidNavigateMainFramePostCommit(
+    const NavigationController::LoadCommittedDetails& details,
+    const ViewHostMsg_FrameNavigate_Params& params) {
+  // Allow the new page to set the title again.
+  received_page_title_ = false;
+}
+
+void HistoryTabHelper::DidNavigateAnyFramePostCommit(
+    const NavigationController::LoadCommittedDetails& details,
+    const ViewHostMsg_FrameNavigate_Params& params) {
+  // Update history. Note that this needs to happen after the entry is complete,
+  // which WillNavigate[Main,Sub]Frame will do before this function is called.
+  if (!params.should_update_history)
+    return;
+
+  // Most of the time, the displayURL matches the loaded URL, but for about:
+  // URLs, we use a data: URL as the real value.  We actually want to save the
+  // about: URL to the history db and keep the data: URL hidden. This is what
+  // the TabContents' URL getter does.
+  scoped_refptr<history::HistoryAddPageArgs> add_page_args(
+      CreateHistoryAddPageArgs(tab_contents()->GetURL(), details, params));
+  if (!tab_contents()->delegate() ||
+      !tab_contents()->delegate()->ShouldAddNavigationToHistory(
+          *add_page_args, details.type))
+    return;
+
+  UpdateHistoryForNavigation(add_page_args);
+}
+
+void HistoryTabHelper::Observe(NotificationType type,
+                               const NotificationSource& source,
+                               const NotificationDetails& details) {
+  DCHECK(type.value == NotificationType::TAB_CONTENTS_TITLE_UPDATED);
+  TitleUpdatedDetails* title = Details<TitleUpdatedDetails>(details).ptr();
+
+  if (received_page_title_)
+    return;
+
+  UpdateHistoryPageTitle(*title->entry());
+
+  received_page_title_ = title->explicit_set();
+}
+
+void HistoryTabHelper::OnPageContents(const GURL& url,
+                                      int32 page_id,
+                                      const string16& contents) {
+  // Don't index any https pages. People generally don't want their bank
+  // accounts, etc. indexed on their computer, especially since some of these
+  // things are not marked cachable.
+  // TODO(brettw) we may want to consider more elaborate heuristics such as
+  // the cachability of the page. We may also want to consider subframes (this
+  // test will still index subframes if the subframe is SSL).
+  // TODO(zelidrag) bug chromium-os:2808 - figure out if we want to reenable
+  // content indexing for chromeos in some future releases.
+#if !defined(OS_CHROMEOS)
+  if (!url.SchemeIsSecure()) {
+    HistoryService* hs = GetHistoryService();
+    if (hs)
+      hs->SetPageContents(url, contents);
+  }
+#endif
+}
+
+void HistoryTabHelper::OnThumbnail(const GURL& url,
+                                   const ThumbnailScore& score,
+                                   const SkBitmap& bitmap) {
+  if (tab_contents()->profile()->IsOffTheRecord())
+    return;
+
+  // Tell History about this thumbnail
+  history::TopSites* ts = tab_contents()->profile()->GetTopSites();
+  if (ts)
+    ts->SetPageThumbnail(url, bitmap, score);
+}
+
+HistoryService* HistoryTabHelper::GetHistoryService() {
+  if (tab_contents()->profile()->IsOffTheRecord())
+    return NULL;
+
+  return tab_contents()->profile()->GetHistoryService(Profile::IMPLICIT_ACCESS);
+}
Property changes on: chrome\browser\history\history_tab_helper.cc
___________________________________________________________________
Added: svn:eol-style
   + LF