chrome/browser/ui/browser.cc - Issue 580023003: Rename the drive: scheme with the externalfile: scheme.

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/ui/browser.cc

Issue 580023003: Rename the drive: scheme with the externalfile: scheme. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Rebased. Created 6 years, 3 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/ui/browser.cc

diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc

index 63c0e8c8fe2c1c5fe51228ad5318f7b250ad5e9d..5edd456decff5c44ac950358d96dfb3229157fbd 100644

--- a/chrome/browser/ui/browser.cc

+++ b/chrome/browser/ui/browser.cc

@@ -205,7 +205,7 @@

#endif // OS_WIN

#if defined(OS_CHROMEOS)

-#include "chrome/browser/chromeos/drive/file_system_util.h"

+#include "chrome/browser/chromeos/fileapi/external_file_url_util.h"

#endif

#if defined(USE_ASH)

@@ -1923,7 +1923,10 @@ void Browser::FileSelectedWithExtraInfo(const ui::SelectedFileInfo& file_info,

GURL url = net::FilePathToFileURL(file_info.local_path);

#if defined(OS_CHROMEOS)

- drive::util::MaybeSetDriveURL(profile_, file_info.file_path, &url);

+ const GURL external_url =

+ chromeos::CreateExternalFileURLFromPath(profile_, file_info.file_path);

+ if (!external_url.is_empty())

+ url = external_url;

#endif

if (url.is_empty())

« no previous file with comments | « chrome/browser/profiles/profile_io_data.cc ('k') | chrome/browser/ui/location_bar/origin_chip_info.cc » ('j') | no next file with comments »