chrome/browser/system_monitor/media_storage_util_linux.cc - Issue 10919051: Move device notification impl out of chrome/browser/media_gallery

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

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

Side by Side Diff: chrome/browser/system_monitor/media_storage_util_linux.cc

Issue 10919051: Move device notification impl out of chrome/browser/media_gallery (Closed) Base URL: http://git.chromium.org/chromium/src.git@master

Patch Set: modify for chromeos and win Created 8 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 unified diff | Download patch

OLD	NEW
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 // Linux specific implementation of chrome::MediaStorageUtil.	5 // Linux specific implementation of chrome::MediaStorageUtil.

6	6

7 #include "chrome/browser/media_gallery/media_storage_util.h"	7 #include "chrome/browser/system_monitor/media_storage_util.h"

8	8

9 #include "base/callback.h"	9 #include "base/callback.h"

10 #include "base/system_monitor/system_monitor.h"	10 #include "base/system_monitor/system_monitor.h"

11 #include "chrome/browser/media_gallery/removable_device_notifications_linux.h"	11 #include "chrome/browser/system_monitor/removable_device_notifications_linux.h"

12	12

13 namespace chrome {	13 namespace chrome {

14	14

15 // static	15 // static

16 void MediaStorageUtil::GetDeviceInfoFromPathImpl(const FilePath& path,	16 void MediaStorageUtil::GetDeviceInfoFromPathImpl(const FilePath& path,

17 std::string* device_id,	17 std::string* device_id,

18 string16* device_name,	18 string16* device_name,

19 FilePath* relative_path) {	19 FilePath* relative_path) {

20 RemovableDeviceNotificationsLinux* device_tracker =	20 RemovableDeviceNotificationsLinux* device_tracker =

21 RemovableDeviceNotificationsLinux::GetInstance();	21 RemovableDeviceNotificationsLinux::GetInstance();

(...skipping 16 matching lines...) Expand all Loading...
38	38

39 if (device_id)	39 if (device_id)

40 *device_id = MakeDeviceId(FIXED_MASS_STORAGE, path.AsUTF8Unsafe());	40 *device_id = MakeDeviceId(FIXED_MASS_STORAGE, path.AsUTF8Unsafe());

41 if (device_name)	41 if (device_name)

42 *device_name = path.BaseName().LossyDisplayName();	42 *device_name = path.BaseName().LossyDisplayName();

43 if (relative_path)	43 if (relative_path)

44 *relative_path = FilePath();	44 *relative_path = FilePath();

45 }	45 }

46	46

47 } // namespace chrome	47 } // namespace chrome

OLD	NEW