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

Side by Side Diff: chrome/browser/chrome_content_browser_client.cc

Issue 11414180: Add a gyp flag to allow removing dependency on ppapi. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 8 years 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
« no previous file with comments | « chrome/browser/browsing_data/browsing_data_remover.cc ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 "chrome/browser/chrome_content_browser_client.h" 5 #include "chrome/browser/chrome_content_browser_client.h"
6 6
7 #include <set> 7 #include <set>
8 #include <utility> 8 #include <utility>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 1733 matching lines...) Expand 10 before | Expand all | Expand 10 after
1744 FilePath ChromeContentBrowserClient::GetDefaultDownloadDirectory() { 1744 FilePath ChromeContentBrowserClient::GetDefaultDownloadDirectory() {
1745 return download_util::GetDefaultDownloadDirectory(); 1745 return download_util::GetDefaultDownloadDirectory();
1746 } 1746 }
1747 1747
1748 std::string ChromeContentBrowserClient::GetDefaultDownloadName() { 1748 std::string ChromeContentBrowserClient::GetDefaultDownloadName() {
1749 return l10n_util::GetStringUTF8(IDS_DEFAULT_DOWNLOAD_FILENAME); 1749 return l10n_util::GetStringUTF8(IDS_DEFAULT_DOWNLOAD_FILENAME);
1750 } 1750 }
1751 1751
1752 void ChromeContentBrowserClient::DidCreatePpapiPlugin( 1752 void ChromeContentBrowserClient::DidCreatePpapiPlugin(
1753 content::BrowserPpapiHost* browser_host) { 1753 content::BrowserPpapiHost* browser_host) {
1754 #if defined(ENABLE_PLUGINS)
1754 browser_host->GetPpapiHost()->AddHostFactoryFilter( 1755 browser_host->GetPpapiHost()->AddHostFactoryFilter(
1755 scoped_ptr<ppapi::host::HostFactory>( 1756 scoped_ptr<ppapi::host::HostFactory>(
1756 new ChromeBrowserPepperHostFactory(browser_host))); 1757 new ChromeBrowserPepperHostFactory(browser_host)));
1758 #endif
1757 } 1759 }
1758 1760
1759 content::BrowserPpapiHost* 1761 content::BrowserPpapiHost*
1760 ChromeContentBrowserClient::GetExternalBrowserPpapiHost( 1762 ChromeContentBrowserClient::GetExternalBrowserPpapiHost(
1761 int plugin_process_id) { 1763 int plugin_process_id) {
1762 BrowserChildProcessHostIterator iter(content::PROCESS_TYPE_NACL_LOADER); 1764 BrowserChildProcessHostIterator iter(content::PROCESS_TYPE_NACL_LOADER);
1763 while (!iter.Done()) { 1765 while (!iter.Done()) {
1764 NaClProcessHost* host = static_cast<NaClProcessHost*>(iter.GetDelegate()); 1766 NaClProcessHost* host = static_cast<NaClProcessHost*>(iter.GetDelegate());
1765 if (host->process() && 1767 if (host->process() &&
1766 host->process()->GetData().id == plugin_process_id) { 1768 host->process()->GetData().id == plugin_process_id) {
(...skipping 159 matching lines...) Expand 10 before | Expand all | Expand 10 after
1926 io_thread_application_locale_ = locale; 1928 io_thread_application_locale_ = locale;
1927 } 1929 }
1928 1930
1929 void ChromeContentBrowserClient::SetApplicationLocaleOnIOThread( 1931 void ChromeContentBrowserClient::SetApplicationLocaleOnIOThread(
1930 const std::string& locale) { 1932 const std::string& locale) {
1931 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); 1933 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
1932 io_thread_application_locale_ = locale; 1934 io_thread_application_locale_ = locale;
1933 } 1935 }
1934 1936
1935 } // namespace chrome 1937 } // namespace chrome
OLDNEW
« no previous file with comments | « chrome/browser/browsing_data/browsing_data_remover.cc ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698