Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(464)

Side by Side Diff: content/browser/web_contents/web_contents_impl.cc

Issue 11824050: InstantExtended: Committed NTP (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Cleanup. Created 7 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/browser/web_contents/web_contents_impl.h" 5 #include "content/browser/web_contents/web_contents_impl.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/metrics/histogram.h" 10 #include "base/metrics/histogram.h"
(...skipping 1936 matching lines...) Expand 10 before | Expand all | Expand 10 after
1947 int id = StartDownload(host, url, image_size); 1947 int id = StartDownload(host, url, image_size);
1948 favicon_download_map_[id] = callback; 1948 favicon_download_map_[id] = callback;
1949 return id; 1949 return id;
1950 } 1950 }
1951 1951
1952 bool WebContentsImpl::FocusLocationBarByDefault() { 1952 bool WebContentsImpl::FocusLocationBarByDefault() {
1953 WebUI* web_ui = GetWebUIForCurrentState(); 1953 WebUI* web_ui = GetWebUIForCurrentState();
1954 if (web_ui) 1954 if (web_ui)
1955 return web_ui->ShouldFocusLocationBarByDefault(); 1955 return web_ui->ShouldFocusLocationBarByDefault();
1956 NavigationEntry* entry = controller_.GetActiveEntry(); 1956 NavigationEntry* entry = controller_.GetActiveEntry();
1957 return (entry && entry->GetURL() == GURL(chrome::kAboutBlankURL)); 1957 return (entry && (
Jered 2013/01/10 15:53:54 next line
samarth 2013/01/11 19:43:05 Done.
1958 entry->GetVirtualURL() == GURL(chrome::kAboutBlankURL) ||
1959 entry->GetVirtualURL() == GURL(chrome::kChromeUINewTabURL)));
1958 } 1960 }
1959 1961
1960 void WebContentsImpl::SetFocusToLocationBar(bool select_all) { 1962 void WebContentsImpl::SetFocusToLocationBar(bool select_all) {
1961 if (delegate_) 1963 if (delegate_)
1962 delegate_->SetFocusToLocationBar(select_all); 1964 delegate_->SetFocusToLocationBar(select_all);
1963 } 1965 }
1964 1966
1965 void WebContentsImpl::OnRegisterIntentService( 1967 void WebContentsImpl::OnRegisterIntentService(
1966 const webkit_glue::WebIntentServiceData& data, 1968 const webkit_glue::WebIntentServiceData& data,
1967 bool user_gesture) { 1969 bool user_gesture) {
(...skipping 1430 matching lines...) Expand 10 before | Expand all | Expand 10 after
3398 3400
3399 BrowserPluginGuest* WebContentsImpl::GetBrowserPluginGuest() { 3401 BrowserPluginGuest* WebContentsImpl::GetBrowserPluginGuest() {
3400 return browser_plugin_guest_.get(); 3402 return browser_plugin_guest_.get();
3401 } 3403 }
3402 3404
3403 BrowserPluginEmbedder* WebContentsImpl::GetBrowserPluginEmbedder() { 3405 BrowserPluginEmbedder* WebContentsImpl::GetBrowserPluginEmbedder() {
3404 return browser_plugin_embedder_.get(); 3406 return browser_plugin_embedder_.get();
3405 } 3407 }
3406 3408
3407 } // namespace content 3409 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698