When users navigate to an intranet host that has not been previously typed, treat it as a typed n...

chrome/browser/history/history_backend.cc

 // 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_backend.h"
 
 #include <list>
 #include <map>
 #include <set>
 #include <vector>
@@ skipping 74 matching lines @@
 // deleting some.
 static const int kMaxRedirectCount = 32;
 
 // The number of days old a history entry can be before it is considered "old"
 // and is archived.
 static const int kArchiveDaysThreshold = 90;
 
 // Converts from PageUsageData to MostVisitedURL. |redirects| is a
 // list of redirects for this URL. Empty list means no redirects.
 MostVisitedURL MakeMostVisitedURL(const PageUsageData& page_data,
-                                           const RedirectList& redirects) {
+                                  const RedirectList& redirects) {
   MostVisitedURL mv;
   mv.url = page_data.GetURL();
   mv.title = page_data.GetTitle();
   if (redirects.empty()) {
     // Redirects must contain at least the target url.
     mv.redirects.push_back(mv.url);
   } else {
     mv.redirects = redirects;
     if (mv.redirects[mv.redirects.size() - 1] != mv.url) {
       // The last url must be the target url.
@@ skipping 293 matching lines @@
   // If the user is adding older history, we need to make sure our times
   // are correct.
   if (request->time < first_recorded_time_)
     first_recorded_time_ = request->time;
 
   content::PageTransition transition =
     content::PageTransitionStripQualifier(request->transition);
   bool is_keyword_generated =
       (transition == content::PAGE_TRANSITION_KEYWORD_GENERATED);
 
-  if (request->redirects.size() <= 1) {
+  // If the user is navigating to a not-previously-typed intranet hostname,
+  // change the transition to TYPED so that the omnibox will learn that this is
+  // a known host.
+  bool has_redirects = request->redirects.size() > 1;
+  if (content::PageTransitionIsMainFrame(request->transition) &&
+      (transition != content::PAGE_TRANSITION_TYPED) && !is_keyword_generated) {
+    const GURL& origin_url(has_redirects ?
+        request->redirects[0] : request->url);
+    if (origin_url.SchemeIs(chrome::kHttpScheme)) {
+      std::string host(origin_url.host());
+      if ((net::RegistryControlledDomainService::GetRegistryLength(
+          host, false) == 0) && !db_->IsTypedHost(host)) {
+        transition = content::PAGE_TRANSITION_TYPED;
+        request->transition = content::PageTransitionFromInt(transition |
+            content::PageTransitionGetQualifier(request->transition));
+      }
+    }
+  }
+
+  if (!has_redirects) {
     // The single entry is both a chain start and end.
     content::PageTransition t = content::PageTransitionFromInt(
         request->transition |
         content::PAGE_TRANSITION_CHAIN_START |
         content::PAGE_TRANSITION_CHAIN_END);
 
     // No redirect case (one element means just the page itself).
     last_ids = AddPageVisit(request->url, last_recorded_time_,
                             last_ids.second, t, request->visit_source);
 
@@ skipping 1851 matching lines @@
         break;
       }
     }
   }
   UMA_HISTOGRAM_TIMES("History.GetFavIconFromDB",  // historical name
                       TimeTicks::Now() - beginning_time);
   return success;
 }
 
 }  // namespace history