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

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

Issue 11825007: Fix the loading progress bar for Android. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase and removed whitespace change. 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 | Annotate | Revision Log
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 1975 matching lines...) Expand 10 before | Expand all | Expand 10 after
1986 int64 parent_frame_id, 1986 int64 parent_frame_id,
1987 bool is_main_frame, 1987 bool is_main_frame,
1988 const GURL& url) { 1988 const GURL& url) {
1989 bool is_error_page = (url.spec() == kUnreachableWebDataURL); 1989 bool is_error_page = (url.spec() == kUnreachableWebDataURL);
1990 bool is_iframe_srcdoc = (url.spec() == chrome::kAboutSrcDocURL); 1990 bool is_iframe_srcdoc = (url.spec() == chrome::kAboutSrcDocURL);
1991 GURL validated_url(url); 1991 GURL validated_url(url);
1992 RenderProcessHost* render_process_host = 1992 RenderProcessHost* render_process_host =
1993 render_view_host->GetProcess(); 1993 render_view_host->GetProcess();
1994 RenderViewHost::FilterURL(render_process_host, false, &validated_url); 1994 RenderViewHost::FilterURL(render_process_host, false, &validated_url);
1995 1995
1996 if (is_main_frame)
1997 DidChangeLoadProgress(0);
1998
1996 // Notify observers about the start of the provisional load. 1999 // Notify observers about the start of the provisional load.
1997 FOR_EACH_OBSERVER(WebContentsObserver, observers_, 2000 FOR_EACH_OBSERVER(WebContentsObserver, observers_,
1998 DidStartProvisionalLoadForFrame(frame_id, parent_frame_id, 2001 DidStartProvisionalLoadForFrame(frame_id, parent_frame_id,
1999 is_main_frame, validated_url, is_error_page, 2002 is_main_frame, validated_url, is_error_page,
2000 is_iframe_srcdoc, render_view_host)); 2003 is_iframe_srcdoc, render_view_host));
2001 2004
2002 if (is_main_frame) { 2005 if (is_main_frame) {
2003 // Notify observers about the provisional change in the main frame URL. 2006 // Notify observers about the provisional change in the main frame URL.
2004 FOR_EACH_OBSERVER(WebContentsObserver, observers_, 2007 FOR_EACH_OBSERVER(WebContentsObserver, observers_,
2005 ProvisionalChangeToMainFrameUrl(validated_url, 2008 ProvisionalChangeToMainFrameUrl(validated_url,
(...skipping 1392 matching lines...) Expand 10 before | Expand all | Expand 10 after
3398 3401
3399 BrowserPluginGuest* WebContentsImpl::GetBrowserPluginGuest() { 3402 BrowserPluginGuest* WebContentsImpl::GetBrowserPluginGuest() {
3400 return browser_plugin_guest_.get(); 3403 return browser_plugin_guest_.get();
3401 } 3404 }
3402 3405
3403 BrowserPluginEmbedder* WebContentsImpl::GetBrowserPluginEmbedder() { 3406 BrowserPluginEmbedder* WebContentsImpl::GetBrowserPluginEmbedder() {
3404 return browser_plugin_embedder_.get(); 3407 return browser_plugin_embedder_.get();
3405 } 3408 }
3406 3409
3407 } // namespace content 3410 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698