chrome/browser/chromeos/extensions/file_manager_util.cc - Issue 10915226: OBSOLETE - Move drive.proto to browser/google_apis directory

Side by Side Diff: chrome/browser/chromeos/extensions/file_manager_util.cc

Issue 10915226: OBSOLETE - Move drive.proto to browser/google_apis directory (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Rebase 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

« no previous file with comments | « chrome/browser/chromeos/extensions/file_browser_private_api.cc ('k') | chrome/browser/chromeos/gdata/document_entry_conversion.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 #include "chrome/browser/chromeos/extensions/file_manager_util.h"	4 #include "chrome/browser/chromeos/extensions/file_manager_util.h"

5	5

6 #include "base/bind.h"	6 #include "base/bind.h"

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

8 #include "base/json/json_reader.h"	8 #include "base/json/json_reader.h"

9 #include "base/json/json_writer.h"	9 #include "base/json/json_writer.h"

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

11 #include "base/metrics/histogram.h"	11 #include "base/metrics/histogram.h"

12 #include "base/path_service.h"	12 #include "base/path_service.h"

13 #include "base/string_util.h"	13 #include "base/string_util.h"

14 #include "base/utf_string_conversions.h"	14 #include "base/utf_string_conversions.h"

15 #include "base/values.h"	15 #include "base/values.h"

16 #include "chrome/browser/chromeos/extensions/file_handler_util.h"	16 #include "chrome/browser/chromeos/extensions/file_handler_util.h"

17 #include "chrome/browser/chromeos/gdata/drive.pb.h"

18 #include "chrome/browser/chromeos/gdata/drive_file_system.h"	17 #include "chrome/browser/chromeos/gdata/drive_file_system.h"

19 #include "chrome/browser/chromeos/gdata/drive_file_system_util.h"	18 #include "chrome/browser/chromeos/gdata/drive_file_system_util.h"

20 #include "chrome/browser/chromeos/gdata/drive_files.h"	19 #include "chrome/browser/chromeos/gdata/drive_files.h"

21 #include "chrome/browser/chromeos/gdata/drive_system_service.h"	20 #include "chrome/browser/chromeos/gdata/drive_system_service.h"

22 #include "chrome/browser/chromeos/media/media_player.h"	21 #include "chrome/browser/chromeos/media/media_player.h"

23 #include "chrome/browser/extensions/crx_installer.h"	22 #include "chrome/browser/extensions/crx_installer.h"

24 #include "chrome/browser/extensions/extension_install_prompt.h"	23 #include "chrome/browser/extensions/extension_install_prompt.h"

25 #include "chrome/browser/extensions/extension_service.h"	24 #include "chrome/browser/extensions/extension_service.h"

	25 #include "chrome/browser/google_apis/drive.pb.h"

26 #include "chrome/browser/google_apis/operation_registry.h"	26 #include "chrome/browser/google_apis/operation_registry.h"

27 #include "chrome/browser/plugin_prefs.h"	27 #include "chrome/browser/plugin_prefs.h"

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

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

30 #include "chrome/browser/ui/browser.h"	30 #include "chrome/browser/ui/browser.h"

31 #include "chrome/browser/ui/browser_finder.h"	31 #include "chrome/browser/ui/browser_finder.h"

32 #include "chrome/browser/ui/browser_list.h"	32 #include "chrome/browser/ui/browser_list.h"

33 #include "chrome/browser/ui/browser_tabstrip.h"	33 #include "chrome/browser/ui/browser_tabstrip.h"

34 #include "chrome/browser/ui/browser_window.h"	34 #include "chrome/browser/ui/browser_window.h"

35 #include "chrome/browser/ui/extensions/application_launch.h"	35 #include "chrome/browser/ui/extensions/application_launch.h"

(...skipping 742 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
778 OperationRegistry::ProgressStatus>::const_iterator iter =	778 OperationRegistry::ProgressStatus>::const_iterator iter =

779 list.begin();	779 list.begin();

780 iter != list.end(); ++iter) {	780 iter != list.end(); ++iter) {

781 result_list->Append(	781 result_list->Append(

782 ProgessStatusToDictionaryValue(profile, origin_url, *iter));	782 ProgessStatusToDictionaryValue(profile, origin_url, *iter));

783 }	783 }

784 return result_list.release();	784 return result_list.release();

785 }	785 }

786	786

787 } // namespace file_manager_util	787 } // namespace file_manager_util

OLD	NEW