Clean-up, not returning anything in InstantController void method.

chrome/browser/instant/instant_controller.cc

 // Copyright (c) 2010 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_controller.h"
 
 #include "base/command_line.h"
 #include "base/metrics/histogram.h"
 #include "base/rand_util.h"
 #include "chrome/browser/autocomplete/autocomplete_match.h"
@@ skipping 234 matching lines @@
   return loader_manager_->current_loader()->IsMouseDownFromActivate();
 }
 
 void InstantController::OnAutocompleteLostFocus(
     gfx::NativeView view_gaining_focus) {
   if (!is_active() || !GetPreviewContents())
     return;
 
   RenderWidgetHostView* rwhv =
       GetPreviewContents()->GetRenderWidgetHostView();
-  if (!view_gaining_focus || !rwhv)
-    return DestroyPreviewContents();
+  if (!view_gaining_focus || !rwhv) {
+    DestroyPreviewContents();
+    return;
+  }
 
   gfx::NativeView tab_view = GetPreviewContents()->GetNativeView();
   // Focus is going to the renderer.
   if (rwhv->GetNativeView() == view_gaining_focus ||
       tab_view == view_gaining_focus) {
     if (!IsMouseDownFromActivate()) {
       // If the mouse is not down, focus is not going to the renderer. Someone
       // else moved focus and we shouldn't commit.
-      return DestroyPreviewContents();
+      DestroyPreviewContents();
+      return;
     }
 
     if (IsShowingInstant()) {
       // We're showing instant results. As instant results may shift when
       // committing we commit on the mouse up. This way a slow click still
       // works fine.
-      return SetCommitOnMouseUp();
+      SetCommitOnMouseUp();
+      return;
     }
 
-    return CommitCurrentPreview(INSTANT_COMMIT_FOCUS_LOST);
+    CommitCurrentPreview(INSTANT_COMMIT_FOCUS_LOST);
+    return;

[sky, 2010/11/17 00:02:35]

no return here.

[Jay Civelli, 2010/11/17 00:11:08]

We were returning previously, right?

[sky, 2010/11/17 00:15:03]

My mistake, you're right.

   }
 
   // Walk up the view hierarchy. If the view gaining focus is a subview of the
   // TabContents view (such as a windowed plugin or http auth dialog), we want
   // to keep the preview contents. Otherwise, focus has gone somewhere else,
   // such as the JS inspector, and we want to cancel the preview.
   gfx::NativeView view_gaining_focus_ancestor = view_gaining_focus;
   while (view_gaining_focus_ancestor &&
          view_gaining_focus_ancestor != tab_view) {
     view_gaining_focus_ancestor =
         platform_util::GetParent(view_gaining_focus_ancestor);
   }
 
-  if (view_gaining_focus_ancestor)
-    return CommitCurrentPreview(INSTANT_COMMIT_FOCUS_LOST);
+  if (view_gaining_focus_ancestor) {
+    CommitCurrentPreview(INSTANT_COMMIT_FOCUS_LOST);
+    return;
+  }
 
-  return DestroyPreviewContents();
+  DestroyPreviewContents();
 }
 
 TabContents* InstantController::ReleasePreviewContents(InstantCommitType type) {
   if (!loader_manager_.get())
     return NULL;
 
   scoped_ptr<InstantLoader> loader(loader_manager_->ReleaseCurrentLoader());
   TabContents* tab = loader->ReleasePreviewContents(type);
 
   ClearBlacklist();
@@ skipping 199 matching lines @@
     template_url = model ? model->GetDefaultSearchProvider() : NULL;
   }
   if (template_url && template_url->id() &&
       template_url->instant_url() &&
       !IsBlacklistedFromInstant(template_url->id()) &&
       template_url->instant_url()->SupportsReplacement()) {
     return template_url;
   }
   return NULL;
 }