chrome/browser/translate/translate_manager.cc - Issue 143733002: Remove FILE_MANAGER_EXTENSION and related configuration. They can be folded back to Chrome OS as co…

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/translate/translate_manager.cc

Issue 143733002: Remove FILE_MANAGER_EXTENSION and related configuration. They can be folded back to Chrome OS as co… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Remove FILE_MANAGER_EXTENSION and related configuration. They can be folded back to Chrome OS as co… Created 6 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/resources/component_extension_resources.grd ('k') | chrome/browser/translate/translate_manager_unittest.cc » ('j') | chrome/chrome_tests.gypi » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/translate/translate_manager.cc

diff --git a/chrome/browser/translate/translate_manager.cc b/chrome/browser/translate/translate_manager.cc

index 50349afe50b89aad12ea529d74035e456299cb5d..feedcd5891feb80caccd8e395a4ddba24d95f5a4 100644

--- a/chrome/browser/translate/translate_manager.cc

+++ b/chrome/browser/translate/translate_manager.cc

@@ -54,7 +54,7 @@

#include "net/base/url_util.h"

#include "net/http/http_status_code.h"

-#ifdef FILE_MANAGER_EXTENSION

+#ifdef OS_CHROMEOS

Lei Zhang 2014/01/21 20:38:01 Change this to #id defined(OS_CHROMEOS) while you

Junichi Uekawa 2014/01/22 01:11:35 Done.

#include "chrome/browser/chromeos/file_manager/app_id.h"

#include "extensions/common/constants.h"

#endif

@@ -104,7 +104,7 @@ bool TranslateManager::IsTranslatableURL(const GURL& url) {

return !url.is_empty() &&

!url.SchemeIs(chrome::kChromeUIScheme) &&

!url.SchemeIs(chrome::kChromeDevToolsScheme) &&

-#ifdef FILE_MANAGER_EXTENSION

+#ifdef OS_CHROMEOS

!(url.SchemeIs(extensions::kExtensionScheme) &&

url.DomainIs(file_manager::kFileManagerAppId)) &&

#endif