chrome/browser/chromeos/extensions/file_manager/private_api_drive.cc - Issue 553983013: Remove storage-related redirect headers in webkit/common/, update #includes and DEPS files to use s…

Side by Side Diff: chrome/browser/chromeos/extensions/file_manager/private_api_drive.cc

Issue 553983013: Remove storage-related redirect headers in webkit/common/, update #includes and DEPS files to use s… (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: scale back some overly aggressive DEPS changes 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 unified diff | Download patch

« chrome/browser/DEPS ('K') | « chrome/browser/chromeos/extensions/file_manager/file_browser_handler_api_test.cc ('k') | chrome/browser/chromeos/extensions/file_manager/private_api_file_system.cc » ('j') | content/DEPS » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 // Copyright 2013 The Chromium Authors. All rights reserved.	1 // Copyright 2013 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/extensions/file_manager/private_api_drive.h"	5 #include "chrome/browser/chromeos/extensions/file_manager/private_api_drive.h"

6	6

7 #include "base/command_line.h"	7 #include "base/command_line.h"

8 #include "chrome/browser/browser_process.h"	8 #include "chrome/browser/browser_process.h"

9 #include "chrome/browser/chromeos/drive/drive_integration_service.h"	9 #include "chrome/browser/chromeos/drive/drive_integration_service.h"

10 #include "chrome/browser/chromeos/extensions/file_manager/private_api_util.h"	10 #include "chrome/browser/chromeos/extensions/file_manager/private_api_util.h"

11 #include "chrome/browser/chromeos/file_manager/file_tasks.h"	11 #include "chrome/browser/chromeos/file_manager/file_tasks.h"

12 #include "chrome/browser/chromeos/file_manager/fileapi_util.h"	12 #include "chrome/browser/chromeos/file_manager/fileapi_util.h"

13 #include "chrome/browser/chromeos/file_manager/url_util.h"	13 #include "chrome/browser/chromeos/file_manager/url_util.h"

14 #include "chrome/browser/chromeos/fileapi/file_system_backend.h"	14 #include "chrome/browser/chromeos/fileapi/file_system_backend.h"

15 #include "chrome/browser/chromeos/profiles/profile_helper.h"	15 #include "chrome/browser/chromeos/profiles/profile_helper.h"

16 #include "chrome/browser/drive/drive_app_registry.h"	16 #include "chrome/browser/drive/drive_app_registry.h"

17 #include "chrome/browser/drive/event_logger.h"	17 #include "chrome/browser/drive/event_logger.h"

18 #include "chrome/browser/profiles/profile.h"	18 #include "chrome/browser/profiles/profile.h"

19 #include "chrome/browser/profiles/profile_manager.h"	19 #include "chrome/browser/profiles/profile_manager.h"

20 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h"	20 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h"

21 #include "chrome/browser/signin/signin_manager_factory.h"	21 #include "chrome/browser/signin/signin_manager_factory.h"

22 #include "chromeos/chromeos_switches.h"	22 #include "chromeos/chromeos_switches.h"

23 #include "components/signin/core/browser/profile_oauth2_token_service.h"	23 #include "components/signin/core/browser/profile_oauth2_token_service.h"

24 #include "components/signin/core/browser/signin_manager.h"	24 #include "components/signin/core/browser/signin_manager.h"

25 #include "content/public/browser/browser_thread.h"	25 #include "content/public/browser/browser_thread.h"

26 #include "google_apis/drive/auth_service.h"	26 #include "google_apis/drive/auth_service.h"

27 #include "webkit/common/fileapi/file_system_info.h"	27 #include "storage/common/fileapi/file_system_info.h"

28 #include "webkit/common/fileapi/file_system_util.h"	28 #include "storage/common/fileapi/file_system_util.h"

29	29

30 using content::BrowserThread;	30 using content::BrowserThread;

31	31

32 using file_manager::util::EntryDefinition;	32 using file_manager::util::EntryDefinition;

33 using file_manager::util::EntryDefinitionCallback;	33 using file_manager::util::EntryDefinitionCallback;

34 using file_manager::util::EntryDefinitionList;	34 using file_manager::util::EntryDefinitionList;

35 using file_manager::util::EntryDefinitionListCallback;	35 using file_manager::util::EntryDefinitionListCallback;

36 using file_manager::util::FileDefinition;	36 using file_manager::util::FileDefinition;

37 using file_manager::util::FileDefinitionList;	37 using file_manager::util::FileDefinitionList;

38 using extensions::api::file_browser_private::EntryProperties;	38 using extensions::api::file_browser_private::EntryProperties;

(...skipping 975 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
1014 return;	1014 return;

1015 }	1015 }

1016	1016

1017 const std::string url = download_url_ + "?access_token=" + access_token;	1017 const std::string url = download_url_ + "?access_token=" + access_token;

1018 SetResult(new base::StringValue(url));	1018 SetResult(new base::StringValue(url));

1019	1019

1020 SendResponse(true);	1020 SendResponse(true);

1021 }	1021 }

1022	1022

1023 } // namespace extensions	1023 } // namespace extensions

OLD	NEW