Omnibox: Preserve display text and select all on a focus search

chrome/browser/ui/omnibox/chrome_omnibox_client.cc

 // Copyright 2013 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/ui/omnibox/chrome_omnibox_client.h"
 
 #include <stddef.h>
 
 #include "base/bind.h"
 #include "base/callback.h"
@@ skipping 122 matching lines @@
 std::unique_ptr<OmniboxNavigationObserver>
 ChromeOmniboxClient::CreateOmniboxNavigationObserver(
     const base::string16& text,
     const AutocompleteMatch& match,
     const AutocompleteMatch& alternate_nav_match) {
   return base::MakeUnique<ChromeOmniboxNavigationObserver>(
       profile_, text, match, alternate_nav_match);
 }
 
 bool ChromeOmniboxClient::CurrentPageExists() const {
-  return (controller_->GetWebContents() != NULL);
+  return controller_->GetWebContents();

[Peter Kasting, 2016/10/25 20:21:27]

This doesn't produce a "forcing to true/false (performance warning)" on MSVC?

[Tom (Use chromium acct), 2016/10/25 21:55:09]

idk, I didn't run a dry run on this PS.
Reverted just in case

 }
 
 const GURL& ChromeOmniboxClient::GetURL() const {
-  return controller_->GetWebContents()->GetVisibleURL();
+  return CurrentPageExists() ? controller_->GetWebContents()->GetVisibleURL()
+                             : GURL::EmptyGURL();
 }
 
 const base::string16& ChromeOmniboxClient::GetTitle() const {
   return controller_->GetWebContents()->GetTitle();
 }
 
 gfx::Image ChromeOmniboxClient::GetFavicon() const {
   return favicon::ContentFaviconDriver::FromWebContents(
              controller_->GetWebContents())
       ->GetFavicon();
@@ skipping 293 matching lines @@
       InstantSearchPrerenderer::GetForProfile(profile_);
   if (prerenderer)
     prerenderer->Prerender(suggestion);
 }
 
 void ChromeOmniboxClient::OnBitmapFetched(const BitmapFetchedCallback& callback,
                                           const SkBitmap& bitmap) {
   request_id_ = BitmapFetcherService::REQUEST_ID_INVALID;
   callback.Run(bitmap);
 }