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

Side by Side Diff: chrome/browser/extensions/api/file_system/file_system_api.cc

Issue 1658793002: Update chrome for new prefs location. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 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 unified diff | Download patch
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/extensions/api/file_system/file_system_api.h" 5 #include "chrome/browser/extensions/api/file_system/file_system_api.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <set> 9 #include <set>
10 #include <vector> 10 #include <vector>
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
57 #include "ui/base/l10n/l10n_util.h" 57 #include "ui/base/l10n/l10n_util.h"
58 #include "ui/shell_dialogs/select_file_dialog.h" 58 #include "ui/shell_dialogs/select_file_dialog.h"
59 #include "ui/shell_dialogs/selected_file_info.h" 59 #include "ui/shell_dialogs/selected_file_info.h"
60 60
61 #if defined(OS_MACOSX) 61 #if defined(OS_MACOSX)
62 #include <CoreFoundation/CoreFoundation.h> 62 #include <CoreFoundation/CoreFoundation.h>
63 #include "base/mac/foundation_util.h" 63 #include "base/mac/foundation_util.h"
64 #endif 64 #endif
65 65
66 #if defined(OS_CHROMEOS) 66 #if defined(OS_CHROMEOS)
67 #include "base/prefs/testing_pref_service.h"
68 #include "base/strings/string16.h" 67 #include "base/strings/string16.h"
69 #include "base/thread_task_runner_handle.h" 68 #include "base/thread_task_runner_handle.h"
70 #include "chrome/browser/chromeos/app_mode/kiosk_app_manager.h" 69 #include "chrome/browser/chromeos/app_mode/kiosk_app_manager.h"
71 #include "chrome/browser/chromeos/file_manager/app_id.h" 70 #include "chrome/browser/chromeos/file_manager/app_id.h"
72 #include "chrome/browser/chromeos/file_manager/filesystem_api_util.h" 71 #include "chrome/browser/chromeos/file_manager/filesystem_api_util.h"
73 #include "chrome/browser/extensions/api/file_system/request_file_system_dialog_v iew.h" 72 #include "chrome/browser/extensions/api/file_system/request_file_system_dialog_v iew.h"
74 #include "chrome/browser/extensions/api/file_system/request_file_system_notifica tion.h" 73 #include "chrome/browser/extensions/api/file_system/request_file_system_notifica tion.h"
75 #include "chrome/browser/ui/simple_message_box.h" 74 #include "chrome/browser/ui/simple_message_box.h"
75 #include "components/prefs/testing_pref_service.h"
76 #include "components/user_manager/user_manager.h" 76 #include "components/user_manager/user_manager.h"
77 #include "extensions/browser/event_router.h" 77 #include "extensions/browser/event_router.h"
78 #include "extensions/browser/extension_registry.h" 78 #include "extensions/browser/extension_registry.h"
79 #include "extensions/common/constants.h" 79 #include "extensions/common/constants.h"
80 #include "extensions/common/manifest_handlers/kiosk_mode_info.h" 80 #include "extensions/common/manifest_handlers/kiosk_mode_info.h"
81 #include "url/url_constants.h" 81 #include "url/url_constants.h"
82 #endif 82 #endif
83 83
84 using apps::SavedFileEntry; 84 using apps::SavedFileEntry;
85 using apps::SavedFilesService; 85 using apps::SavedFilesService;
(...skipping 1371 matching lines...) Expand 10 before | Expand all | Expand 10 after
1457 using api::file_system::Volume; 1457 using api::file_system::Volume;
1458 std::vector<linked_ptr<Volume>> result_volume_list; 1458 std::vector<linked_ptr<Volume>> result_volume_list;
1459 FillVolumeList(chrome_details_.GetProfile(), &result_volume_list); 1459 FillVolumeList(chrome_details_.GetProfile(), &result_volume_list);
1460 1460
1461 return RespondNow(ArgumentList( 1461 return RespondNow(ArgumentList(
1462 api::file_system::GetVolumeList::Results::Create(result_volume_list))); 1462 api::file_system::GetVolumeList::Results::Create(result_volume_list)));
1463 } 1463 }
1464 #endif 1464 #endif
1465 1465
1466 } // namespace extensions 1466 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698