diff options
Diffstat (limited to 'chrome/browser')
43 files changed, 71 insertions, 69 deletions
diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc index cfd1f7d..5d84306 100644 --- a/chrome/browser/chrome_content_browser_client.cc +++ b/chrome/browser/chrome_content_browser_client.cc @@ -1619,7 +1619,7 @@ bool ChromeContentBrowserClient::AllowGetCookie( const net::CookieList& cookie_list, content::ResourceContext* context, int render_process_id, - int render_view_id) { + int render_frame_id) { DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); ProfileIOData* io_data = ProfileIOData::FromResourceContext(context); bool allow = io_data->GetCookieSettings()-> @@ -1628,7 +1628,7 @@ bool ChromeContentBrowserClient::AllowGetCookie( BrowserThread::PostTask( BrowserThread::UI, FROM_HERE, base::Bind(&TabSpecificContentSettings::CookiesRead, render_process_id, - render_view_id, url, first_party, cookie_list, !allow)); + render_frame_id, url, first_party, cookie_list, !allow)); return allow; } @@ -1638,7 +1638,7 @@ bool ChromeContentBrowserClient::AllowSetCookie( const std::string& cookie_line, content::ResourceContext* context, int render_process_id, - int render_view_id, + int render_frame_id, net::CookieOptions* options) { DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); ProfileIOData* io_data = ProfileIOData::FromResourceContext(context); @@ -1648,7 +1648,7 @@ bool ChromeContentBrowserClient::AllowSetCookie( BrowserThread::PostTask( BrowserThread::UI, FROM_HERE, base::Bind(&TabSpecificContentSettings::CookieChanged, render_process_id, - render_view_id, url, first_party, cookie_line, *options, + render_frame_id, url, first_party, cookie_line, *options, !allow)); return allow; } diff --git a/chrome/browser/chrome_content_browser_client.h b/chrome/browser/chrome_content_browser_client.h index 2fd5e07..6387bf6 100644 --- a/chrome/browser/chrome_content_browser_client.h +++ b/chrome/browser/chrome_content_browser_client.h @@ -123,13 +123,13 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient { const net::CookieList& cookie_list, content::ResourceContext* context, int render_process_id, - int render_view_id) OVERRIDE; + int render_frame_id) OVERRIDE; virtual bool AllowSetCookie(const GURL& url, const GURL& first_party, const std::string& cookie_line, content::ResourceContext* context, int render_process_id, - int render_view_id, + int render_frame_id, net::CookieOptions* options) OVERRIDE; virtual bool AllowSaveLocalState(content::ResourceContext* context) OVERRIDE; virtual bool AllowWorkerDatabase( diff --git a/chrome/browser/content_settings/tab_specific_content_settings.cc b/chrome/browser/content_settings/tab_specific_content_settings.cc index f605595..a5b74ac 100644 --- a/chrome/browser/content_settings/tab_specific_content_settings.cc +++ b/chrome/browser/content_settings/tab_specific_content_settings.cc @@ -116,13 +116,14 @@ TabSpecificContentSettings* TabSpecificContentSettings::GetForFrame( // static void TabSpecificContentSettings::CookiesRead(int render_process_id, - int render_view_id, + int render_frame_id, const GURL& url, const GURL& frame_url, const net::CookieList& cookie_list, bool blocked_by_policy) { DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); - TabSpecificContentSettings* settings = Get(render_process_id, render_view_id); + TabSpecificContentSettings* settings = + GetForFrame(render_process_id, render_frame_id); if (settings) { settings->OnCookiesRead(url, frame_url, cookie_list, blocked_by_policy); @@ -132,14 +133,15 @@ void TabSpecificContentSettings::CookiesRead(int render_process_id, // static void TabSpecificContentSettings::CookieChanged( int render_process_id, - int render_view_id, + int render_frame_id, const GURL& url, const GURL& frame_url, const std::string& cookie_line, const net::CookieOptions& options, bool blocked_by_policy) { DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); - TabSpecificContentSettings* settings = Get(render_process_id, render_view_id); + TabSpecificContentSettings* settings = + GetForFrame(render_process_id, render_frame_id); if (settings) settings->OnCookieChanged(url, frame_url, cookie_line, options, blocked_by_policy); diff --git a/chrome/browser/content_settings/tab_specific_content_settings.h b/chrome/browser/content_settings/tab_specific_content_settings.h index 9543016..358075b 100644 --- a/chrome/browser/content_settings/tab_specific_content_settings.h +++ b/chrome/browser/content_settings/tab_specific_content_settings.h @@ -96,7 +96,7 @@ class TabSpecificContentSettings // reading cookies was blocked due to the user's content settings. In that // case, this function should invoke OnContentBlocked. static void CookiesRead(int render_process_id, - int render_view_id, + int render_frame_id, const GURL& url, const GURL& first_party_url, const net::CookieList& cookie_list, @@ -107,7 +107,7 @@ class TabSpecificContentSettings // user's content settings. In that case, this function should invoke // OnContentBlocked. static void CookieChanged(int render_process_id, - int render_view_id, + int render_frame_id, const GURL& url, const GURL& first_party_url, const std::string& cookie_line, diff --git a/chrome/browser/net/chrome_network_delegate.cc b/chrome/browser/net/chrome_network_delegate.cc index ba5eae6..57e15d6 100644 --- a/chrome/browser/net/chrome_network_delegate.cc +++ b/chrome/browser/net/chrome_network_delegate.cc @@ -650,13 +650,13 @@ bool ChromeNetworkDelegate::OnCanGetCookies( request.url(), request.first_party_for_cookies()); int render_process_id = -1; - int render_view_id = -1; - if (content::ResourceRequestInfo::GetRenderViewForRequest( - &request, &render_process_id, &render_view_id)) { + int render_frame_id = -1; + if (content::ResourceRequestInfo::GetRenderFrameForRequest( + &request, &render_process_id, &render_frame_id)) { BrowserThread::PostTask( BrowserThread::UI, FROM_HERE, base::Bind(&TabSpecificContentSettings::CookiesRead, - render_process_id, render_view_id, + render_process_id, render_frame_id, request.url(), request.first_party_for_cookies(), cookie_list, !allow)); } @@ -675,13 +675,13 @@ bool ChromeNetworkDelegate::OnCanSetCookie(const net::URLRequest& request, request.url(), request.first_party_for_cookies()); int render_process_id = -1; - int render_view_id = -1; - if (content::ResourceRequestInfo::GetRenderViewForRequest( - &request, &render_process_id, &render_view_id)) { + int render_frame_id = -1; + if (content::ResourceRequestInfo::GetRenderFrameForRequest( + &request, &render_process_id, &render_frame_id)) { BrowserThread::PostTask( BrowserThread::UI, FROM_HERE, base::Bind(&TabSpecificContentSettings::CookieChanged, - render_process_id, render_view_id, + render_process_id, render_frame_id, request.url(), request.first_party_for_cookies(), cookie_line, *options, !allow)); } diff --git a/chrome/browser/search/iframe_source_unittest.cc b/chrome/browser/search/iframe_source_unittest.cc index 7df025d..cf40af7 100644 --- a/chrome/browser/search/iframe_source_unittest.cc +++ b/chrome/browser/search/iframe_source_unittest.cc @@ -46,7 +46,7 @@ class TestIframeSource : public IframeSource { virtual void StartDataRequest( const std::string& path, int render_process_id, - int render_view_id, + int render_frame_id, const content::URLDataSource::GotDataCallback& callback) OVERRIDE { } diff --git a/chrome/browser/search/local_ntp_source.cc b/chrome/browser/search/local_ntp_source.cc index 6277c4c..f53e1b8 100644 --- a/chrome/browser/search/local_ntp_source.cc +++ b/chrome/browser/search/local_ntp_source.cc @@ -134,7 +134,7 @@ std::string LocalNtpSource::GetSource() const { void LocalNtpSource::StartDataRequest( const std::string& path, int render_process_id, - int render_view_id, + int render_frame_id, const content::URLDataSource::GotDataCallback& callback) { const std::string stripped_path = StripParameters(path); if (stripped_path == kConfigDataFilename) { diff --git a/chrome/browser/search/local_ntp_source.h b/chrome/browser/search/local_ntp_source.h index 410a2d1..66fd76c 100644 --- a/chrome/browser/search/local_ntp_source.h +++ b/chrome/browser/search/local_ntp_source.h @@ -25,7 +25,7 @@ class LocalNtpSource : public content::URLDataSource { virtual void StartDataRequest( const std::string& path, int render_process_id, - int render_view_id, + int render_frame_id, const content::URLDataSource::GotDataCallback& callback) OVERRIDE; virtual std::string GetMimeType(const std::string& path) const OVERRIDE; virtual bool ShouldServiceRequest( diff --git a/chrome/browser/search/most_visited_iframe_source.cc b/chrome/browser/search/most_visited_iframe_source.cc index 7ba9252..94481f5 100644 --- a/chrome/browser/search/most_visited_iframe_source.cc +++ b/chrome/browser/search/most_visited_iframe_source.cc @@ -45,7 +45,7 @@ std::string MostVisitedIframeSource::GetSource() const { void MostVisitedIframeSource::StartDataRequest( const std::string& path_and_query, int render_process_id, - int render_view_id, + int render_frame_id, const content::URLDataSource::GotDataCallback& callback) { GURL url(chrome::kChromeSearchMostVisitedUrl + path_and_query); std::string path(url.path()); diff --git a/chrome/browser/search/most_visited_iframe_source.h b/chrome/browser/search/most_visited_iframe_source.h index c05d0d8..fad9823 100644 --- a/chrome/browser/search/most_visited_iframe_source.h +++ b/chrome/browser/search/most_visited_iframe_source.h @@ -26,7 +26,7 @@ class MostVisitedIframeSource : public IframeSource { virtual void StartDataRequest( const std::string& path_and_query, int render_process_id, - int render_view_id, + int render_frame_id, const content::URLDataSource::GotDataCallback& callback) OVERRIDE; protected: diff --git a/chrome/browser/search_engines/template_url_fetcher.cc b/chrome/browser/search_engines/template_url_fetcher.cc index 03d3705..0d86d682 100644 --- a/chrome/browser/search_engines/template_url_fetcher.cc +++ b/chrome/browser/search_engines/template_url_fetcher.cc @@ -14,8 +14,8 @@ #include "chrome/browser/search_engines/template_url_parser.h" #include "chrome/browser/search_engines/template_url_service.h" #include "chrome/browser/search_engines/template_url_service_factory.h" +#include "content/public/browser/render_frame_host.h" #include "content/public/browser/render_process_host.h" -#include "content/public/browser/render_view_host.h" #include "content/public/browser/web_contents.h" #include "content/public/common/url_fetcher.h" #include "net/base/load_flags.h" @@ -98,11 +98,11 @@ TemplateURLFetcher::RequestDelegate::RequestDelegate( url_fetcher_->SetRequestContext(fetcher->profile()->GetRequestContext()); // Can be NULL during tests. if (web_contents) { - content::AssociateURLFetcherWithRenderView( + content::AssociateURLFetcherWithRenderFrame( url_fetcher_.get(), web_contents->GetURL(), web_contents->GetRenderProcessHost()->GetID(), - web_contents->GetRenderViewHost()->GetRoutingID()); + web_contents->GetMainFrame()->GetRoutingID()); } url_fetcher_->Start(); diff --git a/chrome/browser/ui/webui/about_ui.cc b/chrome/browser/ui/webui/about_ui.cc index 05879c7..66c71ea 100644 --- a/chrome/browser/ui/webui/about_ui.cc +++ b/chrome/browser/ui/webui/about_ui.cc @@ -996,7 +996,7 @@ std::string AboutUIHTMLSource::GetSource() const { void AboutUIHTMLSource::StartDataRequest( const std::string& path, int render_process_id, - int render_view_id, + int render_frame_id, const content::URLDataSource::GotDataCallback& callback) { std::string response; // Add your data source here, in alphabetical order. diff --git a/chrome/browser/ui/webui/about_ui.h b/chrome/browser/ui/webui/about_ui.h index d2bcda8..b98695e 100644 --- a/chrome/browser/ui/webui/about_ui.h +++ b/chrome/browser/ui/webui/about_ui.h @@ -26,7 +26,7 @@ class AboutUIHTMLSource : public content::URLDataSource { virtual void StartDataRequest( const std::string& path, int render_process_id, - int render_view_id, + int render_frame_id, const content::URLDataSource::GotDataCallback& callback) OVERRIDE; virtual std::string GetMimeType(const std::string& path) const OVERRIDE; virtual bool ShouldAddContentSecurityPolicy() const OVERRIDE; diff --git a/chrome/browser/ui/webui/app_launcher_page_ui.cc b/chrome/browser/ui/webui/app_launcher_page_ui.cc index d318420..1de9db3 100644 --- a/chrome/browser/ui/webui/app_launcher_page_ui.cc +++ b/chrome/browser/ui/webui/app_launcher_page_ui.cc @@ -92,7 +92,7 @@ std::string AppLauncherPageUI::HTMLSource::GetSource() const { void AppLauncherPageUI::HTMLSource::StartDataRequest( const std::string& path, int render_process_id, - int render_view_id, + int render_frame_id, const content::URLDataSource::GotDataCallback& callback) { DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); diff --git a/chrome/browser/ui/webui/app_launcher_page_ui.h b/chrome/browser/ui/webui/app_launcher_page_ui.h index a867721..b21b363 100644 --- a/chrome/browser/ui/webui/app_launcher_page_ui.h +++ b/chrome/browser/ui/webui/app_launcher_page_ui.h @@ -35,7 +35,7 @@ class AppLauncherPageUI : public content::WebUIController { virtual void StartDataRequest( const std::string& path, int render_process_id, - int render_view_id, + int render_frame_id, const content::URLDataSource::GotDataCallback& callback) OVERRIDE; virtual std::string GetMimeType(const std::string&) const OVERRIDE; virtual bool ShouldReplaceExistingSource() const OVERRIDE; diff --git a/chrome/browser/ui/webui/bookmarks_ui.cc b/chrome/browser/ui/webui/bookmarks_ui.cc index ca8ac4b..1259adf 100644 --- a/chrome/browser/ui/webui/bookmarks_ui.cc +++ b/chrome/browser/ui/webui/bookmarks_ui.cc @@ -29,7 +29,7 @@ std::string BookmarksUIHTMLSource::GetSource() const { void BookmarksUIHTMLSource::StartDataRequest( const std::string& path, int render_process_id, - int render_view_id, + int render_frame_id, const content::URLDataSource::GotDataCallback& callback) { NOTREACHED() << "We should never get here since the extension should have" << "been triggered"; diff --git a/chrome/browser/ui/webui/bookmarks_ui.h b/chrome/browser/ui/webui/bookmarks_ui.h index 62fcc95..54eaca1 100644 --- a/chrome/browser/ui/webui/bookmarks_ui.h +++ b/chrome/browser/ui/webui/bookmarks_ui.h @@ -26,7 +26,7 @@ class BookmarksUIHTMLSource : public content::URLDataSource { virtual void StartDataRequest( const std::string& path, int render_process_id, - int render_view_id, + int render_frame_id, const content::URLDataSource::GotDataCallback& callback) OVERRIDE; virtual std::string GetMimeType(const std::string& path) const OVERRIDE; diff --git a/chrome/browser/ui/webui/chromeos/login/screenlock_icon_source.cc b/chrome/browser/ui/webui/chromeos/login/screenlock_icon_source.cc index d6ec467..71c2f0b 100644 --- a/chrome/browser/ui/webui/chromeos/login/screenlock_icon_source.cc +++ b/chrome/browser/ui/webui/chromeos/login/screenlock_icon_source.cc @@ -36,7 +36,7 @@ std::string ScreenlockIconSource::GetSource() const { void ScreenlockIconSource::StartDataRequest( const std::string& path, int render_process_id, - int render_view_id, + int render_frame_id, const content::URLDataSource::GotDataCallback& callback) { if (!icon_provider_) { callback.Run(GetDefaultIcon().As1xPNGBytes()); diff --git a/chrome/browser/ui/webui/chromeos/login/screenlock_icon_source.h b/chrome/browser/ui/webui/chromeos/login/screenlock_icon_source.h index fcabc2d..3d4bdf6 100644 --- a/chrome/browser/ui/webui/chromeos/login/screenlock_icon_source.h +++ b/chrome/browser/ui/webui/chromeos/login/screenlock_icon_source.h @@ -23,7 +23,7 @@ class ScreenlockIconSource : public content::URLDataSource { virtual void StartDataRequest( const std::string& path, int render_process_id, - int render_view_id, + int render_frame_id, const content::URLDataSource::GotDataCallback& callback) OVERRIDE; virtual std::string GetMimeType(const std::string& path) const OVERRIDE; diff --git a/chrome/browser/ui/webui/chromeos/mobile_setup_ui.cc b/chrome/browser/ui/webui/chromeos/mobile_setup_ui.cc index 486ce96..5dcc4bd 100644 --- a/chrome/browser/ui/webui/chromeos/mobile_setup_ui.cc +++ b/chrome/browser/ui/webui/chromeos/mobile_setup_ui.cc @@ -148,7 +148,7 @@ class MobileSetupUIHTMLSource : public content::URLDataSource { virtual void StartDataRequest( const std::string& path, int render_process_id, - int render_view_id, + int render_frame_id, const content::URLDataSource::GotDataCallback& callback) OVERRIDE; virtual std::string GetMimeType(const std::string&) const OVERRIDE { return "text/html"; @@ -271,7 +271,7 @@ std::string MobileSetupUIHTMLSource::GetSource() const { void MobileSetupUIHTMLSource::StartDataRequest( const std::string& path, int render_process_id, - int render_view_id, + int render_frame_id, const content::URLDataSource::GotDataCallback& callback) { NetworkHandler::Get()->network_configuration_handler()->GetProperties( path, diff --git a/chrome/browser/ui/webui/chromeos/proxy_settings_ui.cc b/chrome/browser/ui/webui/chromeos/proxy_settings_ui.cc index c46dfc6..b015146 100644 --- a/chrome/browser/ui/webui/chromeos/proxy_settings_ui.cc +++ b/chrome/browser/ui/webui/chromeos/proxy_settings_ui.cc @@ -37,7 +37,7 @@ class ProxySettingsHTMLSource : public content::URLDataSource { virtual void StartDataRequest( const std::string& path, int render_process_id, - int render_view_id, + int render_frame_id, const content::URLDataSource::GotDataCallback& callback) OVERRIDE; virtual std::string GetMimeType(const std::string&) const OVERRIDE { return "text/html"; @@ -67,7 +67,7 @@ std::string ProxySettingsHTMLSource::GetSource() const { void ProxySettingsHTMLSource::StartDataRequest( const std::string& path, int render_process_id, - int render_view_id, + int render_frame_id, const content::URLDataSource::GotDataCallback& callback) { webui::SetFontAndTextDirection(localized_strings_.get()); diff --git a/chrome/browser/ui/webui/chromeos/sim_unlock_ui.cc b/chrome/browser/ui/webui/chromeos/sim_unlock_ui.cc index 3a80401..c5f383e 100644 --- a/chrome/browser/ui/webui/chromeos/sim_unlock_ui.cc +++ b/chrome/browser/ui/webui/chromeos/sim_unlock_ui.cc @@ -87,7 +87,7 @@ class SimUnlockUIHTMLSource : public content::URLDataSource { virtual void StartDataRequest( const std::string& path, int render_process_id, - int render_view_id, + int render_frame_id, const content::URLDataSource::GotDataCallback& callback) OVERRIDE; virtual std::string GetMimeType(const std::string&) const OVERRIDE { return "text/html"; @@ -290,7 +290,7 @@ std::string SimUnlockUIHTMLSource::GetSource() const { void SimUnlockUIHTMLSource::StartDataRequest( const std::string& path, int render_process_id, - int render_view_id, + int render_frame_id, const content::URLDataSource::GotDataCallback& callback) { DictionaryValue strings; strings.SetString("title", diff --git a/chrome/browser/ui/webui/chromeos/slow_trace_ui.cc b/chrome/browser/ui/webui/chromeos/slow_trace_ui.cc index 19f568c..208a816e 100644 --- a/chrome/browser/ui/webui/chromeos/slow_trace_ui.cc +++ b/chrome/browser/ui/webui/chromeos/slow_trace_ui.cc @@ -34,7 +34,7 @@ std::string SlowTraceSource::GetSource() const { void SlowTraceSource::StartDataRequest( const std::string& path, int render_process_id, - int render_view_id, + int render_frame_id, const content::URLDataSource::GotDataCallback& callback) { int trace_id = 0; size_t pos = path.find('#'); diff --git a/chrome/browser/ui/webui/chromeos/slow_trace_ui.h b/chrome/browser/ui/webui/chromeos/slow_trace_ui.h index 82f192f..97878c7 100644 --- a/chrome/browser/ui/webui/chromeos/slow_trace_ui.h +++ b/chrome/browser/ui/webui/chromeos/slow_trace_ui.h @@ -32,7 +32,7 @@ class SlowTraceSource : public content::URLDataSource { virtual void StartDataRequest( const std::string& path, int render_process_id, - int render_view_id, + int render_frame_id, const content::URLDataSource::GotDataCallback& callback) OVERRIDE; virtual std::string GetMimeType(const std::string& path) const OVERRIDE; diff --git a/chrome/browser/ui/webui/devtools_ui.cc b/chrome/browser/ui/webui/devtools_ui.cc index df95d3b..6e02e89 100644 --- a/chrome/browser/ui/webui/devtools_ui.cc +++ b/chrome/browser/ui/webui/devtools_ui.cc @@ -122,14 +122,14 @@ class DevToolsDataSource : public content::URLDataSource { virtual void StartDataRequest( const std::string& path, int render_process_id, - int render_view_id, + int render_frame_id, const content::URLDataSource::GotDataCallback& callback) OVERRIDE { std::string bundled_path_prefix(chrome::kChromeUIDevToolsBundledPath); bundled_path_prefix += "/"; if (StartsWithASCII(path, bundled_path_prefix, false)) { StartBundledDataRequest(path.substr(bundled_path_prefix.length()), render_process_id, - render_view_id, + render_frame_id, callback); return; } @@ -138,7 +138,7 @@ class DevToolsDataSource : public content::URLDataSource { if (StartsWithASCII(path, remote_path_prefix, false)) { StartRemoteDataRequest(path.substr(remote_path_prefix.length()), render_process_id, - render_view_id, + render_frame_id, callback); return; } @@ -148,7 +148,7 @@ class DevToolsDataSource : public content::URLDataSource { void StartBundledDataRequest( const std::string& path, int render_process_id, - int render_view_id, + int render_frame_id, const content::URLDataSource::GotDataCallback& callback) { std::string filename = PathWithoutParams(path); @@ -168,7 +168,7 @@ class DevToolsDataSource : public content::URLDataSource { void StartRemoteDataRequest( const std::string& path, int render_process_id, - int render_view_id, + int render_frame_id, const content::URLDataSource::GotDataCallback& callback) { GURL url = GURL(kRemoteFrontendBase + path); CHECK_EQ(url.host(), kRemoteFrontendDomain); diff --git a/chrome/browser/ui/webui/extensions/extension_icon_source.cc b/chrome/browser/ui/webui/extensions/extension_icon_source.cc index 92ec916..9bd7db8 100644 --- a/chrome/browser/ui/webui/extensions/extension_icon_source.cc +++ b/chrome/browser/ui/webui/extensions/extension_icon_source.cc @@ -118,7 +118,7 @@ std::string ExtensionIconSource::GetMimeType(const std::string&) const { void ExtensionIconSource::StartDataRequest( const std::string& path, int render_process_id, - int render_view_id, + int render_frame_id, const content::URLDataSource::GotDataCallback& callback) { // This is where everything gets started. First, parse the request and make // the request data available for later. diff --git a/chrome/browser/ui/webui/extensions/extension_icon_source.h b/chrome/browser/ui/webui/extensions/extension_icon_source.h index 7a94d11..def0324 100644 --- a/chrome/browser/ui/webui/extensions/extension_icon_source.h +++ b/chrome/browser/ui/webui/extensions/extension_icon_source.h @@ -75,7 +75,7 @@ class ExtensionIconSource : public content::URLDataSource, virtual void StartDataRequest( const std::string& path, int render_process_id, - int render_view_id, + int render_frame_id, const content::URLDataSource::GotDataCallback& callback) OVERRIDE; private: diff --git a/chrome/browser/ui/webui/favicon_source.cc b/chrome/browser/ui/webui/favicon_source.cc index 765b804..cef2344 100644 --- a/chrome/browser/ui/webui/favicon_source.cc +++ b/chrome/browser/ui/webui/favicon_source.cc @@ -61,7 +61,7 @@ std::string FaviconSource::GetSource() const { void FaviconSource::StartDataRequest( const std::string& path, int render_process_id, - int render_view_id, + int render_frame_id, const content::URLDataSource::GotDataCallback& callback) { FaviconService* favicon_service = FaviconServiceFactory::GetForProfile(profile_, Profile::EXPLICIT_ACCESS); diff --git a/chrome/browser/ui/webui/favicon_source.h b/chrome/browser/ui/webui/favicon_source.h index 13203173..1d52562 100644 --- a/chrome/browser/ui/webui/favicon_source.h +++ b/chrome/browser/ui/webui/favicon_source.h @@ -75,7 +75,7 @@ class FaviconSource : public content::URLDataSource { virtual void StartDataRequest( const std::string& path, int render_process_id, - int render_view_id, + int render_frame_id, const content::URLDataSource::GotDataCallback& callback) OVERRIDE; virtual std::string GetMimeType(const std::string&) const OVERRIDE; virtual bool ShouldReplaceExistingSource() const OVERRIDE; diff --git a/chrome/browser/ui/webui/fileicon_source.cc b/chrome/browser/ui/webui/fileicon_source.cc index 5d57416..3da4336 100644 --- a/chrome/browser/ui/webui/fileicon_source.cc +++ b/chrome/browser/ui/webui/fileicon_source.cc @@ -130,7 +130,7 @@ std::string FileIconSource::GetSource() const { void FileIconSource::StartDataRequest( const std::string& url_path, int render_process_id, - int render_view_id, + int render_frame_id, const content::URLDataSource::GotDataCallback& callback) { std::string query; base::FilePath file_path; diff --git a/chrome/browser/ui/webui/fileicon_source.h b/chrome/browser/ui/webui/fileicon_source.h index ebc796d..c5a73ea 100644 --- a/chrome/browser/ui/webui/fileicon_source.h +++ b/chrome/browser/ui/webui/fileicon_source.h @@ -28,7 +28,7 @@ class FileIconSource : public content::URLDataSource { virtual void StartDataRequest( const std::string& path, int render_process_id, - int render_view_id, + int render_frame_id, const content::URLDataSource::GotDataCallback& callback) OVERRIDE; virtual std::string GetMimeType(const std::string&) const OVERRIDE; diff --git a/chrome/browser/ui/webui/ntp/new_tab_ui.cc b/chrome/browser/ui/webui/ntp/new_tab_ui.cc index ed82f70..e9f7a9e 100644 --- a/chrome/browser/ui/webui/ntp/new_tab_ui.cc +++ b/chrome/browser/ui/webui/ntp/new_tab_ui.cc @@ -353,7 +353,7 @@ std::string NewTabUI::NewTabHTMLSource::GetSource() const { void NewTabUI::NewTabHTMLSource::StartDataRequest( const std::string& path, int render_process_id, - int render_view_id, + int render_frame_id, const content::URLDataSource::GotDataCallback& callback) { DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); diff --git a/chrome/browser/ui/webui/ntp/new_tab_ui.h b/chrome/browser/ui/webui/ntp/new_tab_ui.h index b28775a..7421f87 100644 --- a/chrome/browser/ui/webui/ntp/new_tab_ui.h +++ b/chrome/browser/ui/webui/ntp/new_tab_ui.h @@ -92,7 +92,7 @@ class NewTabUI : public content::WebUIController, virtual void StartDataRequest( const std::string& path, int render_process_id, - int render_view_id, + int render_frame_id, const content::URLDataSource::GotDataCallback& callback) OVERRIDE; virtual std::string GetMimeType(const std::string&) const OVERRIDE; virtual bool ShouldReplaceExistingSource() const OVERRIDE; diff --git a/chrome/browser/ui/webui/ntp/thumbnail_list_source.cc b/chrome/browser/ui/webui/ntp/thumbnail_list_source.cc index f4be12d..69a7dfd 100644 --- a/chrome/browser/ui/webui/ntp/thumbnail_list_source.cc +++ b/chrome/browser/ui/webui/ntp/thumbnail_list_source.cc @@ -92,7 +92,7 @@ std::string ThumbnailListSource::GetSource() const { void ThumbnailListSource::StartDataRequest( const std::string& path, int render_process_id, - int render_view_id, + int render_frame_id, const content::URLDataSource::GotDataCallback& callback) { profile_->GetTopSites()->GetMostVisitedURLs( base::Bind(&ThumbnailListSource::OnMostVisitedURLsAvailable, diff --git a/chrome/browser/ui/webui/ntp/thumbnail_list_source.h b/chrome/browser/ui/webui/ntp/thumbnail_list_source.h index 3e04ead..605c9c2 100644 --- a/chrome/browser/ui/webui/ntp/thumbnail_list_source.h +++ b/chrome/browser/ui/webui/ntp/thumbnail_list_source.h @@ -36,7 +36,7 @@ class ThumbnailListSource : public content::URLDataSource { virtual void StartDataRequest( const std::string& path, int render_process_id, - int render_view_id, + int render_frame_id, const content::URLDataSource::GotDataCallback& callback) OVERRIDE; virtual std::string GetMimeType(const std::string& path) const OVERRIDE; virtual base::MessageLoop* MessageLoopForRequestPath( diff --git a/chrome/browser/ui/webui/ntp/thumbnail_source.cc b/chrome/browser/ui/webui/ntp/thumbnail_source.cc index f3a1c6d..b2ad802 100644 --- a/chrome/browser/ui/webui/ntp/thumbnail_source.cc +++ b/chrome/browser/ui/webui/ntp/thumbnail_source.cc @@ -37,7 +37,7 @@ std::string ThumbnailSource::GetSource() const { void ThumbnailSource::StartDataRequest( const std::string& path, int render_process_id, - int render_view_id, + int render_frame_id, const content::URLDataSource::GotDataCallback& callback) { scoped_refptr<base::RefCountedMemory> data; if (thumbnail_service_->GetPageThumbnail(GURL(path), capture_thumbnails_, diff --git a/chrome/browser/ui/webui/ntp/thumbnail_source.h b/chrome/browser/ui/webui/ntp/thumbnail_source.h index 167dffa..e0d7f05 100644 --- a/chrome/browser/ui/webui/ntp/thumbnail_source.h +++ b/chrome/browser/ui/webui/ntp/thumbnail_source.h @@ -32,7 +32,7 @@ class ThumbnailSource : public content::URLDataSource { virtual void StartDataRequest( const std::string& path, int render_process_id, - int render_view_id, + int render_frame_id, const content::URLDataSource::GotDataCallback& callback) OVERRIDE; virtual std::string GetMimeType(const std::string& path) const OVERRIDE; virtual base::MessageLoop* MessageLoopForRequestPath( diff --git a/chrome/browser/ui/webui/options/chromeos/user_image_source.cc b/chrome/browser/ui/webui/options/chromeos/user_image_source.cc index 5d56278..ee359fd 100644 --- a/chrome/browser/ui/webui/options/chromeos/user_image_source.cc +++ b/chrome/browser/ui/webui/options/chromeos/user_image_source.cc @@ -89,7 +89,7 @@ std::string UserImageSource::GetSource() const { void UserImageSource::StartDataRequest( const std::string& path, int render_process_id, - int render_view_id, + int render_frame_id, const content::URLDataSource::GotDataCallback& callback) { std::string email; bool is_image_animated = false; diff --git a/chrome/browser/ui/webui/options/chromeos/user_image_source.h b/chrome/browser/ui/webui/options/chromeos/user_image_source.h index 362a447..f7a2fb6 100644 --- a/chrome/browser/ui/webui/options/chromeos/user_image_source.h +++ b/chrome/browser/ui/webui/options/chromeos/user_image_source.h @@ -31,7 +31,7 @@ class UserImageSource : public content::URLDataSource { virtual void StartDataRequest( const std::string& path, int render_process_id, - int render_view_id, + int render_frame_id, const content::URLDataSource::GotDataCallback& callback) OVERRIDE; virtual std::string GetMimeType(const std::string& path) const OVERRIDE; diff --git a/chrome/browser/ui/webui/options/options_ui.cc b/chrome/browser/ui/webui/options/options_ui.cc index fb2ec20..65cdaa1 100644 --- a/chrome/browser/ui/webui/options/options_ui.cc +++ b/chrome/browser/ui/webui/options/options_ui.cc @@ -120,7 +120,7 @@ class OptionsUIHTMLSource : public content::URLDataSource { virtual void StartDataRequest( const std::string& path, int render_process_id, - int render_view_id, + int render_frame_id, const content::URLDataSource::GotDataCallback& callback) OVERRIDE; virtual std::string GetMimeType(const std::string&) const OVERRIDE; virtual bool ShouldDenyXFrameOptions() const OVERRIDE; @@ -146,7 +146,7 @@ std::string OptionsUIHTMLSource::GetSource() const { void OptionsUIHTMLSource::StartDataRequest( const std::string& path, int render_process_id, - int render_view_id, + int render_frame_id, const content::URLDataSource::GotDataCallback& callback) { scoped_refptr<base::RefCountedMemory> response_bytes; webui::SetFontAndTextDirection(localized_strings_.get()); diff --git a/chrome/browser/ui/webui/system_info_ui.cc b/chrome/browser/ui/webui/system_info_ui.cc index 900f1ab..7d757e5 100644 --- a/chrome/browser/ui/webui/system_info_ui.cc +++ b/chrome/browser/ui/webui/system_info_ui.cc @@ -51,7 +51,7 @@ class SystemInfoUIHTMLSource : public content::URLDataSource{ virtual void StartDataRequest( const std::string& path, int render_process_id, - int render_view_id, + int render_frame_id, const content::URLDataSource::GotDataCallback& callback) OVERRIDE; virtual std::string GetMimeType(const std::string&) const OVERRIDE { return "text/html"; @@ -105,7 +105,7 @@ std::string SystemInfoUIHTMLSource::GetSource() const { void SystemInfoUIHTMLSource::StartDataRequest( const std::string& path, int render_process_id, - int render_view_id, + int render_frame_id, const content::URLDataSource::GotDataCallback& callback) { path_ = path; callback_ = callback; diff --git a/chrome/browser/ui/webui/theme_source.cc b/chrome/browser/ui/webui/theme_source.cc index b161177..4489807 100644 --- a/chrome/browser/ui/webui/theme_source.cc +++ b/chrome/browser/ui/webui/theme_source.cc @@ -59,7 +59,7 @@ std::string ThemeSource::GetSource() const { void ThemeSource::StartDataRequest( const std::string& path, int render_process_id, - int render_view_id, + int render_frame_id, const content::URLDataSource::GotDataCallback& callback) { // Default scale factor if not specified. ui::ScaleFactor scale_factor; diff --git a/chrome/browser/ui/webui/theme_source.h b/chrome/browser/ui/webui/theme_source.h index b4f3f0c..6b937732 100644 --- a/chrome/browser/ui/webui/theme_source.h +++ b/chrome/browser/ui/webui/theme_source.h @@ -28,7 +28,7 @@ class ThemeSource : public content::URLDataSource { virtual void StartDataRequest( const std::string& path, int render_process_id, - int render_view_id, + int render_frame_id, const content::URLDataSource::GotDataCallback& callback) OVERRIDE; virtual std::string GetMimeType(const std::string& path) const OVERRIDE; virtual base::MessageLoop* MessageLoopForRequestPath( |