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

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

Issue 2618393003: Remove ScopedVector from ContentBrowserClient. (Closed)
Patch Set: rebase Created 3 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 <stddef.h> 7 #include <stddef.h>
8 8
9 #include <cmath> 9 #include <cmath>
10 #include <utility> 10 #include <utility>
(...skipping 4517 matching lines...) Expand 10 before | Expand all | Expand 10 after
4528 4528
4529 if (loading_weak_factory_.HasWeakPtrs()) 4529 if (loading_weak_factory_.HasWeakPtrs())
4530 return; 4530 return;
4531 4531
4532 base::ThreadTaskRunnerHandle::Get()->PostDelayedTask( 4532 base::ThreadTaskRunnerHandle::Get()->PostDelayedTask(
4533 FROM_HERE, base::Bind(&WebContentsImpl::SendChangeLoadProgress, 4533 FROM_HERE, base::Bind(&WebContentsImpl::SendChangeLoadProgress,
4534 loading_weak_factory_.GetWeakPtr()), 4534 loading_weak_factory_.GetWeakPtr()),
4535 min_delay); 4535 min_delay);
4536 } 4536 }
4537 4537
4538 ScopedVector<NavigationThrottle> WebContentsImpl::CreateThrottlesForNavigation( 4538 std::vector<std::unique_ptr<NavigationThrottle>>
4539 WebContentsImpl::CreateThrottlesForNavigation(
4539 NavigationHandle* navigation_handle) { 4540 NavigationHandle* navigation_handle) {
4540 return GetContentClient()->browser()->CreateThrottlesForNavigation( 4541 return GetContentClient()->browser()->CreateThrottlesForNavigation(
4541 navigation_handle); 4542 navigation_handle);
4542 } 4543 }
4543 4544
4544 std::unique_ptr<NavigationUIData> WebContentsImpl::GetNavigationUIData( 4545 std::unique_ptr<NavigationUIData> WebContentsImpl::GetNavigationUIData(
4545 NavigationHandle* navigation_handle) { 4546 NavigationHandle* navigation_handle) {
4546 DCHECK(IsBrowserSideNavigationEnabled()); 4547 DCHECK(IsBrowserSideNavigationEnabled());
4547 return GetContentClient()->browser()->GetNavigationUIData(navigation_handle); 4548 return GetContentClient()->browser()->GetNavigationUIData(navigation_handle);
4548 } 4549 }
(...skipping 870 matching lines...) Expand 10 before | Expand all | Expand 10 after
5419 GetMainFrame()->AddMessageToConsole( 5420 GetMainFrame()->AddMessageToConsole(
5420 content::CONSOLE_MESSAGE_LEVEL_WARNING, 5421 content::CONSOLE_MESSAGE_LEVEL_WARNING,
5421 base::StringPrintf("This site does not have a valid SSL " 5422 base::StringPrintf("This site does not have a valid SSL "
5422 "certificate! Without SSL, your site's and " 5423 "certificate! Without SSL, your site's and "
5423 "visitors' data is vulnerable to theft and " 5424 "visitors' data is vulnerable to theft and "
5424 "tampering. Get a valid SSL certificate before" 5425 "tampering. Get a valid SSL certificate before"
5425 " releasing your website to the public.")); 5426 " releasing your website to the public."));
5426 } 5427 }
5427 5428
5428 } // namespace content 5429 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/web_contents/web_contents_impl.h ('k') | content/public/browser/content_browser_client.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698