OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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 "chrome/browser/nacl_host/nacl_browser_delegate_impl.h" | 5 #include "chrome/browser/nacl_host/nacl_browser_delegate_impl.h" |
6 | 6 |
7 #include <stddef.h> | 7 #include <stddef.h> |
8 | 8 |
9 #include <vector> | 9 #include <vector> |
10 | 10 |
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
56 } | 56 } |
57 } | 57 } |
58 | 58 |
59 NaClBrowserDelegateImpl::~NaClBrowserDelegateImpl() { | 59 NaClBrowserDelegateImpl::~NaClBrowserDelegateImpl() { |
60 } | 60 } |
61 | 61 |
62 void NaClBrowserDelegateImpl::ShowMissingArchInfobar(int render_process_id, | 62 void NaClBrowserDelegateImpl::ShowMissingArchInfobar(int render_process_id, |
63 int render_view_id) { | 63 int render_view_id) { |
64 content::BrowserThread::PostTask( | 64 content::BrowserThread::PostTask( |
65 content::BrowserThread::UI, FROM_HERE, | 65 content::BrowserThread::UI, FROM_HERE, |
66 base::Bind(&NaClInfoBarDelegate::Create, render_process_id, | 66 base::BindOnce(&NaClInfoBarDelegate::Create, render_process_id, |
67 render_view_id)); | 67 render_view_id)); |
68 } | 68 } |
69 | 69 |
70 bool NaClBrowserDelegateImpl::DialogsAreSuppressed() { | 70 bool NaClBrowserDelegateImpl::DialogsAreSuppressed() { |
71 return logging::DialogsAreSuppressed(); | 71 return logging::DialogsAreSuppressed(); |
72 } | 72 } |
73 | 73 |
74 bool NaClBrowserDelegateImpl::GetCacheDirectory(base::FilePath* cache_dir) { | 74 bool NaClBrowserDelegateImpl::GetCacheDirectory(base::FilePath* cache_dir) { |
75 base::FilePath user_data_dir; | 75 base::FilePath user_data_dir; |
76 if (!PathService::Get(chrome::DIR_USER_DATA, &user_data_dir)) | 76 if (!PathService::Get(chrome::DIR_USER_DATA, &user_data_dir)) |
77 return false; | 77 return false; |
(...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
195 const base::FilePath& profile_directory) { | 195 const base::FilePath& profile_directory) { |
196 // Get the profile associated with the renderer. | 196 // Get the profile associated with the renderer. |
197 Profile* profile = profile_manager_->GetProfileByPath(profile_directory); | 197 Profile* profile = profile_manager_->GetProfileByPath(profile_directory); |
198 DCHECK(profile); | 198 DCHECK(profile); |
199 scoped_refptr<extensions::InfoMap> extension_info_map = | 199 scoped_refptr<extensions::InfoMap> extension_info_map = |
200 extensions::ExtensionSystem::Get(profile)->info_map(); | 200 extensions::ExtensionSystem::Get(profile)->info_map(); |
201 DCHECK(extension_info_map.get()); | 201 DCHECK(extension_info_map.get()); |
202 return extension_info_map; | 202 return extension_info_map; |
203 } | 203 } |
204 #endif | 204 #endif |
OLD | NEW |