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

Side by Side Diff: chrome/browser/media_gallery/media_galleries_preferences.cc

Issue 10911242: make media gallery directory tooltips in media gallery config dialog absolute paths (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: +! 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 | Annotate | Revision Log
OLDNEW
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 #include "chrome/browser/media_gallery/media_galleries_preferences.h" 5 #include "chrome/browser/media_gallery/media_galleries_preferences.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/path_service.h" 8 #include "base/path_service.h"
9 #include "base/string_number_conversions.h" 9 #include "base/string_number_conversions.h"
10 #include "base/values.h" 10 #include "base/values.h"
(...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after
119 return dict; 119 return dict;
120 } 120 }
121 121
122 } // namespace 122 } // namespace
123 123
124 MediaGalleryPrefInfo::MediaGalleryPrefInfo() 124 MediaGalleryPrefInfo::MediaGalleryPrefInfo()
125 : pref_id(kInvalidMediaGalleryPrefId) { 125 : pref_id(kInvalidMediaGalleryPrefId) {
126 } 126 }
127 MediaGalleryPrefInfo::~MediaGalleryPrefInfo() {} 127 MediaGalleryPrefInfo::~MediaGalleryPrefInfo() {}
128 128
129 FilePath MediaGalleryPrefInfo::AbsolutePath() const {
130 FilePath base_path = MediaStorageUtil::FindDevicePathById(device_id);
131 return base_path.Append(path);
132 }
133
129 MediaGalleriesPreferences::MediaGalleriesPreferences(Profile* profile) 134 MediaGalleriesPreferences::MediaGalleriesPreferences(Profile* profile)
130 : profile_(profile) { 135 : profile_(profile) {
131 MaybeAddDefaultGalleries(); 136 MaybeAddDefaultGalleries();
132 InitFromPrefs(); 137 InitFromPrefs();
133 } 138 }
134 139
135 MediaGalleriesPreferences::~MediaGalleriesPreferences() {} 140 MediaGalleriesPreferences::~MediaGalleriesPreferences() {}
136 141
137 void MediaGalleriesPreferences::MaybeAddDefaultGalleries() { 142 void MediaGalleriesPreferences::MaybeAddDefaultGalleries() {
138 MediaGalleryPrefId current_id = 143 MediaGalleryPrefId current_id =
(...skipping 276 matching lines...) Expand 10 before | Expand all | Expand 10 after
415 } 420 }
416 421
417 extensions::ExtensionPrefs* 422 extensions::ExtensionPrefs*
418 MediaGalleriesPreferences::GetExtensionPrefs() const { 423 MediaGalleriesPreferences::GetExtensionPrefs() const {
419 ExtensionService* extension_service = 424 ExtensionService* extension_service =
420 extensions::ExtensionSystem::Get(profile_)->extension_service(); 425 extensions::ExtensionSystem::Get(profile_)->extension_service();
421 return extension_service->extension_prefs(); 426 return extension_service->extension_prefs();
422 } 427 }
423 428
424 } // namespace chrome 429 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698