chrome/browser/chromeos/file_manager/open_with_browser.cc - Issue 899033002: Revert of Combine PDF plugin into the Chromium binary.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified 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 side-by-side diff with in-line comments

Download patch

Index: chrome/browser/chromeos/file_manager/open_with_browser.cc

diff --git a/chrome/browser/chromeos/file_manager/open_with_browser.cc b/chrome/browser/chromeos/file_manager/open_with_browser.cc

index 7384caf32085c2db5669a969834b5fcbb8958ae0..974b34a02d618cb655e76b522e017dbc09bb0142 100644

--- a/chrome/browser/chromeos/file_manager/open_with_browser.cc

+++ b/chrome/browser/chromeos/file_manager/open_with_browser.cc

@@ -21,7 +21,6 @@

#include "chrome/browser/ui/browser_tabstrip.h"

#include "chrome/browser/ui/browser_window.h"

#include "chrome/browser/ui/scoped_tabbed_browser_displayer.h"

-#include "chrome/common/chrome_content_client.h"

#include "chrome/common/chrome_paths.h"

#include "chrome/common/chrome_switches.h"

#include "content/public/browser/browser_thread.h"

@@ -87,8 +86,8 @@

bool IsPdfPluginEnabled(Profile* profile) {

DCHECK(profile);

- base::FilePath plugin_path = base::FilePath::FromUTF8Unsafe(

- ChromeContentClient::kPDFPluginPath);

+ base::FilePath plugin_path;

+ PathService::Get(chrome::FILE_PDF_PLUGIN, &plugin_path);

return IsPepperPluginEnabled(profile, plugin_path);

}

« no previous file with comments | « chrome/app/chrome_main_delegate.cc ('k') | chrome/browser/extensions/component_loader.cc » ('j') | no next file with comments »