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

Side by Side Diff: chrome/browser/chromeos/file_manager/open_with_browser.cc

Issue 899033002: Revert of Combine PDF plugin into the Chromium binary. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 10 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
« no previous file with comments | « chrome/app/chrome_main_delegate.cc ('k') | chrome/browser/extensions/component_loader.cc » ('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 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/chromeos/file_manager/open_with_browser.h" 5 #include "chrome/browser/chromeos/file_manager/open_with_browser.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/path_service.h" 10 #include "base/path_service.h"
11 #include "base/threading/sequenced_worker_pool.h" 11 #include "base/threading/sequenced_worker_pool.h"
12 #include "chrome/browser/browser_process.h" 12 #include "chrome/browser/browser_process.h"
13 #include "chrome/browser/chromeos/drive/file_system_util.h" 13 #include "chrome/browser/chromeos/drive/file_system_util.h"
14 #include "chrome/browser/chromeos/file_manager/filesystem_api_util.h" 14 #include "chrome/browser/chromeos/file_manager/filesystem_api_util.h"
15 #include "chrome/browser/chromeos/fileapi/external_file_url_util.h" 15 #include "chrome/browser/chromeos/fileapi/external_file_url_util.h"
16 #include "chrome/browser/drive/drive_api_util.h" 16 #include "chrome/browser/drive/drive_api_util.h"
17 #include "chrome/browser/plugins/plugin_prefs.h" 17 #include "chrome/browser/plugins/plugin_prefs.h"
18 #include "chrome/browser/profiles/profile_manager.h" 18 #include "chrome/browser/profiles/profile_manager.h"
19 #include "chrome/browser/ui/ash/multi_user/multi_user_util.h" 19 #include "chrome/browser/ui/ash/multi_user/multi_user_util.h"
20 #include "chrome/browser/ui/browser.h" 20 #include "chrome/browser/ui/browser.h"
21 #include "chrome/browser/ui/browser_tabstrip.h" 21 #include "chrome/browser/ui/browser_tabstrip.h"
22 #include "chrome/browser/ui/browser_window.h" 22 #include "chrome/browser/ui/browser_window.h"
23 #include "chrome/browser/ui/scoped_tabbed_browser_displayer.h" 23 #include "chrome/browser/ui/scoped_tabbed_browser_displayer.h"
24 #include "chrome/common/chrome_content_client.h"
25 #include "chrome/common/chrome_paths.h" 24 #include "chrome/common/chrome_paths.h"
26 #include "chrome/common/chrome_switches.h" 25 #include "chrome/common/chrome_switches.h"
27 #include "content/public/browser/browser_thread.h" 26 #include "content/public/browser/browser_thread.h"
28 #include "content/public/browser/plugin_service.h" 27 #include "content/public/browser/plugin_service.h"
29 #include "content/public/common/pepper_plugin_info.h" 28 #include "content/public/common/pepper_plugin_info.h"
30 #include "net/base/filename_util.h" 29 #include "net/base/filename_util.h"
31 30
32 using content::BrowserThread; 31 using content::BrowserThread;
33 using content::PluginService; 32 using content::PluginService;
34 33
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
80 scoped_refptr<PluginPrefs> plugin_prefs = PluginPrefs::GetForProfile(profile); 79 scoped_refptr<PluginPrefs> plugin_prefs = PluginPrefs::GetForProfile(profile);
81 if (!plugin_prefs.get()) 80 if (!plugin_prefs.get())
82 return false; 81 return false;
83 82
84 return plugin_prefs->IsPluginEnabled(pepper_info->ToWebPluginInfo()); 83 return plugin_prefs->IsPluginEnabled(pepper_info->ToWebPluginInfo());
85 } 84 }
86 85
87 bool IsPdfPluginEnabled(Profile* profile) { 86 bool IsPdfPluginEnabled(Profile* profile) {
88 DCHECK(profile); 87 DCHECK(profile);
89 88
90 base::FilePath plugin_path = base::FilePath::FromUTF8Unsafe( 89 base::FilePath plugin_path;
91 ChromeContentClient::kPDFPluginPath); 90 PathService::Get(chrome::FILE_PDF_PLUGIN, &plugin_path);
92 return IsPepperPluginEnabled(profile, plugin_path); 91 return IsPepperPluginEnabled(profile, plugin_path);
93 } 92 }
94 93
95 bool IsFlashPluginEnabled(Profile* profile) { 94 bool IsFlashPluginEnabled(Profile* profile) {
96 DCHECK(profile); 95 DCHECK(profile);
97 96
98 base::FilePath plugin_path( 97 base::FilePath plugin_path(
99 base::CommandLine::ForCurrentProcess()->GetSwitchValueNative( 98 base::CommandLine::ForCurrentProcess()->GetSwitchValueNative(
100 switches::kPpapiFlashPath)); 99 switches::kPpapiFlashPath));
101 if (plugin_path.empty()) 100 if (plugin_path.empty())
(...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after
191 base::FilePath::FromUTF8Unsafe("dummy").AddExtension(file_extension); 190 base::FilePath::FromUTF8Unsafe("dummy").AddExtension(file_extension);
192 if (file_path.MatchesExtension(kPdfExtension)) 191 if (file_path.MatchesExtension(kPdfExtension))
193 return IsPdfPluginEnabled(profile); 192 return IsPdfPluginEnabled(profile);
194 if (file_path.MatchesExtension(kSwfExtension)) 193 if (file_path.MatchesExtension(kSwfExtension))
195 return IsFlashPluginEnabled(profile); 194 return IsFlashPluginEnabled(profile);
196 return false; 195 return false;
197 } 196 }
198 197
199 } // namespace util 198 } // namespace util
200 } // namespace file_manager 199 } // namespace file_manager
OLDNEW
« no previous file with comments | « chrome/app/chrome_main_delegate.cc ('k') | chrome/browser/extensions/component_loader.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698