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

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: chrome/browser/chromeos/drive/drive_integration_service.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
« no previous file with comments | « chrome/browser/chromeos/display/display_preferences_unittest.cc ('k') | chrome/browser/chromeos/drive/drive_integration_service_browsertest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/chromeos/drive/drive_integration_service.h" 5 #include "chrome/browser/chromeos/drive/drive_integration_service.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/files/file_util.h" 8 #include "base/files/file_util.h"
9 #include "base/macros.h" 9 #include "base/macros.h"
10 #include "base/prefs/pref_change_registrar.h"
11 #include "base/prefs/pref_service.h"
12 #include "base/strings/stringprintf.h" 10 #include "base/strings/stringprintf.h"
13 #include "base/threading/sequenced_worker_pool.h" 11 #include "base/threading/sequenced_worker_pool.h"
14 #include "chrome/browser/browser_process.h" 12 #include "chrome/browser/browser_process.h"
15 #include "chrome/browser/chrome_notification_types.h" 13 #include "chrome/browser/chrome_notification_types.h"
16 #include "chrome/browser/chromeos/drive/debug_info_collector.h" 14 #include "chrome/browser/chromeos/drive/debug_info_collector.h"
17 #include "chrome/browser/chromeos/drive/download_handler.h" 15 #include "chrome/browser/chromeos/drive/download_handler.h"
18 #include "chrome/browser/chromeos/drive/file_system_util.h" 16 #include "chrome/browser/chromeos/drive/file_system_util.h"
19 #include "chrome/browser/chromeos/file_manager/path_util.h" 17 #include "chrome/browser/chromeos/file_manager/path_util.h"
20 #include "chrome/browser/chromeos/profiles/profile_util.h" 18 #include "chrome/browser/chromeos/profiles/profile_util.h"
21 #include "chrome/browser/download/download_prefs.h" 19 #include "chrome/browser/download/download_prefs.h"
(...skipping 11 matching lines...) Expand all
33 #include "components/drive/drive_notification_manager.h" 31 #include "components/drive/drive_notification_manager.h"
34 #include "components/drive/drive_pref_names.h" 32 #include "components/drive/drive_pref_names.h"
35 #include "components/drive/event_logger.h" 33 #include "components/drive/event_logger.h"
36 #include "components/drive/file_cache.h" 34 #include "components/drive/file_cache.h"
37 #include "components/drive/file_system.h" 35 #include "components/drive/file_system.h"
38 #include "components/drive/job_scheduler.h" 36 #include "components/drive/job_scheduler.h"
39 #include "components/drive/resource_metadata.h" 37 #include "components/drive/resource_metadata.h"
40 #include "components/drive/resource_metadata_storage.h" 38 #include "components/drive/resource_metadata_storage.h"
41 #include "components/drive/service/drive_api_service.h" 39 #include "components/drive/service/drive_api_service.h"
42 #include "components/keyed_service/content/browser_context_dependency_manager.h" 40 #include "components/keyed_service/content/browser_context_dependency_manager.h"
41 #include "components/prefs/pref_change_registrar.h"
42 #include "components/prefs/pref_service.h"
43 #include "components/signin/core/browser/profile_oauth2_token_service.h" 43 #include "components/signin/core/browser/profile_oauth2_token_service.h"
44 #include "components/signin/core/browser/signin_manager.h" 44 #include "components/signin/core/browser/signin_manager.h"
45 #include "components/version_info/version_info.h" 45 #include "components/version_info/version_info.h"
46 #include "content/public/browser/browser_context.h" 46 #include "content/public/browser/browser_context.h"
47 #include "content/public/browser/browser_thread.h" 47 #include "content/public/browser/browser_thread.h"
48 #include "content/public/browser/notification_service.h" 48 #include "content/public/browser/notification_service.h"
49 #include "content/public/common/user_agent.h" 49 #include "content/public/common/user_agent.h"
50 #include "google_apis/drive/auth_service.h" 50 #include "google_apis/drive/auth_service.h"
51 #include "storage/browser/fileapi/external_mount_points.h" 51 #include "storage/browser/fileapi/external_mount_points.h"
52 #include "ui/base/l10n/l10n_util.h" 52 #include "ui/base/l10n/l10n_util.h"
(...skipping 590 matching lines...) Expand 10 before | Expand all | Expand 10 after
643 profile, preference_watcher, 643 profile, preference_watcher,
644 NULL, std::string(), base::FilePath(), NULL); 644 NULL, std::string(), base::FilePath(), NULL);
645 } else { 645 } else {
646 service = factory_for_test_->Run(profile); 646 service = factory_for_test_->Run(profile);
647 } 647 }
648 648
649 return service; 649 return service;
650 } 650 }
651 651
652 } // namespace drive 652 } // namespace drive
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/display/display_preferences_unittest.cc ('k') | chrome/browser/chromeos/drive/drive_integration_service_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698