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

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: Switch LoadProgressChanged back to android only. 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 1966 matching lines...) Expand 10 before | Expand all | Expand 10 after
1977 int64 parent_frame_id, 1977 int64 parent_frame_id,
1978 bool is_main_frame, 1978 bool is_main_frame,
1979 const GURL& url) { 1979 const GURL& url) {
1980 bool is_error_page = (url.spec() == kUnreachableWebDataURL); 1980 bool is_error_page = (url.spec() == kUnreachableWebDataURL);
1981 bool is_iframe_srcdoc = (url.spec() == chrome::kAboutSrcDocURL); 1981 bool is_iframe_srcdoc = (url.spec() == chrome::kAboutSrcDocURL);
1982 GURL validated_url(url); 1982 GURL validated_url(url);
1983 RenderProcessHost* render_process_host = 1983 RenderProcessHost* render_process_host =
1984 render_view_host->GetProcess(); 1984 render_view_host->GetProcess();
1985 RenderViewHost::FilterURL(render_process_host, false, &validated_url); 1985 RenderViewHost::FilterURL(render_process_host, false, &validated_url);
1986 1986
1987 #if defined(OS_ANDROID)
1988 if (delegate_ && is_main_frame)
sky 2013/01/09 20:39:37 Can this invoke DidChangeLoadProgress so that you
Ted C 2013/01/09 21:26:00 Done.
1989 delegate_->LoadProgressChanged(this, 0);
1990 #endif
1991
1987 // Notify observers about the start of the provisional load. 1992 // Notify observers about the start of the provisional load.
1988 FOR_EACH_OBSERVER(WebContentsObserver, observers_, 1993 FOR_EACH_OBSERVER(WebContentsObserver, observers_,
1989 DidStartProvisionalLoadForFrame(frame_id, parent_frame_id, 1994 DidStartProvisionalLoadForFrame(frame_id, parent_frame_id,
1990 is_main_frame, validated_url, is_error_page, 1995 is_main_frame, validated_url, is_error_page,
1991 is_iframe_srcdoc, render_view_host)); 1996 is_iframe_srcdoc, render_view_host));
1992 1997
1993 if (is_main_frame) { 1998 if (is_main_frame) {
1994 // Notify observers about the provisional change in the main frame URL. 1999 // Notify observers about the provisional change in the main frame URL.
1995 FOR_EACH_OBSERVER(WebContentsObserver, observers_, 2000 FOR_EACH_OBSERVER(WebContentsObserver, observers_,
1996 ProvisionalChangeToMainFrameUrl(validated_url, 2001 ProvisionalChangeToMainFrameUrl(validated_url,
(...skipping 1386 matching lines...) Expand 10 before | Expand all | Expand 10 after
3383 3388
3384 BrowserPluginGuest* WebContentsImpl::GetBrowserPluginGuest() { 3389 BrowserPluginGuest* WebContentsImpl::GetBrowserPluginGuest() {
3385 return browser_plugin_guest_.get(); 3390 return browser_plugin_guest_.get();
3386 } 3391 }
3387 3392
3388 BrowserPluginEmbedder* WebContentsImpl::GetBrowserPluginEmbedder() { 3393 BrowserPluginEmbedder* WebContentsImpl::GetBrowserPluginEmbedder() {
3389 return browser_plugin_embedder_.get(); 3394 return browser_plugin_embedder_.get();
3390 } 3395 }
3391 3396
3392 } // namespace content 3397 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698