Omnibox - Make Omnibox Extensions Ignore Stop() Calls Due to User Idleness

chrome/browser/autocomplete/autocomplete_controller.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/autocomplete/autocomplete_controller.h"
 
 #include <set>
 #include <string>
 
 #include "base/format_macros.h"
@@ skipping 282 matching lines @@
   // need the edit model to update the display.
   UpdateResult(false, true);
 
   if (!done_) {
     StartExpireTimer();
     StartStopTimer();
   }
 }
 
 void AutocompleteController::Stop(bool clear_result) {
-  for (Providers::const_iterator i(providers_.begin()); i != providers_.end();

[Mark P, 2015/03/05 20:43:18]

This is a direct move below except for revising the Stop() call.

-       ++i) {
-    (*i)->Stop(clear_result);
-  }
-
-  expire_timer_.Stop();
-  stop_timer_.Stop();
-  done_ = true;
-  if (clear_result && !result_.empty()) {
-    result_.Reset();
-    // NOTE: We pass in false since we're trying to only clear the popup, not
-    // touch the edit... this is all a mess and should be cleaned up :(
-    NotifyChanged(false);
-  }
+  StopHelper(clear_result, false);
 }
 
 void AutocompleteController::OnOmniboxFocused(const AutocompleteInput& input) {
   DCHECK(!in_start_);  // We should not be already running a query.
 
   // Call Start() on all prefix-based providers with an INVALID
   // AutocompleteInput to clear out cached |matches_|, which ensures that
   // they aren't used with zero suggest.
   for (Providers::iterator i(providers_.begin()); i != providers_.end(); ++i)
     (*i)->Start(input, false, true);
@@ skipping 329 matching lines @@
 
   if (result_.HasCopiedMatches())
     expire_timer_.Start(FROM_HERE,
                         base::TimeDelta::FromMilliseconds(kExpireTimeMS),
                         this, &AutocompleteController::ExpireCopiedEntries);
 }
 
 void AutocompleteController::StartStopTimer() {
   stop_timer_.Start(FROM_HERE,
                     stop_timer_duration_,
-                    base::Bind(&AutocompleteController::Stop,
+                    base::Bind(&AutocompleteController::StopHelper,
                                base::Unretained(this),
-                               false));
+                               false, true));
 }
+
+void AutocompleteController::StopHelper(bool clear_result,
+                                        bool user_inactivity_timer) {
+  for (Providers::const_iterator i(providers_.begin()); i != providers_.end();
+       ++i) {
+    (*i)->Stop(clear_result, user_inactivity_timer);
+  }
+
+  expire_timer_.Stop();
+  stop_timer_.Stop();
+  done_ = true;
+  if (clear_result && !result_.empty()) {
+    result_.Reset();
+    // NOTE: We pass in false since we're trying to only clear the popup, not
+    // touch the edit... this is all a mess and should be cleaned up :(
+    NotifyChanged(false);
+  }
+}