chrome/browser/chromeos/extensions/file_manager_util.cc - Issue 10913275: Ben's fixes

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

Issue 10913275: Ben's fixes (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

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

« no previous file with comments | « chrome/app/theme/theme_resources.grd ('k') | chrome/browser/extensions/extension_service.cc » ('j') | no next file with comments »

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"

(...skipping 18 matching lines...) Expand all Loading...
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"

36 #include "chrome/browser/ui/simple_message_box.h"	36 #include "chrome/browser/ui/simple_message_box.h"

37 #include "chrome/browser/ui/tab_contents/tab_contents.h"	37 #include "chrome/browser/ui/tab_contents/tab_contents.h"

38 #include "chrome/browser/ui/tabs/tab_strip_model.h"	38 #include "chrome/browser/ui/tabs/tab_strip_model.h"

	39 #include "chrome/browser/ui/webui/chrome_url_data_manager.h"

39 #include "chrome/common/chrome_paths.h"	40 #include "chrome/common/chrome_paths.h"

40 #include "chrome/common/extensions/file_browser_handler.h"	41 #include "chrome/common/extensions/file_browser_handler.h"

41 #include "chrome/common/url_constants.h"	42 #include "chrome/common/url_constants.h"

42 #include "content/public/browser/browser_thread.h"	43 #include "content/public/browser/browser_thread.h"

43 #include "content/public/browser/plugin_service.h"	44 #include "content/public/browser/plugin_service.h"

44 #include "content/public/browser/user_metrics.h"	45 #include "content/public/browser/user_metrics.h"

45 #include "content/public/browser/web_contents.h"	46 #include "content/public/browser/web_contents.h"

46 #include "grit/generated_resources.h"	47 #include "grit/generated_resources.h"

47 #include "net/base/escape.h"	48 #include "net/base/escape.h"

48 #include "net/base/net_util.h"	49 #include "net/base/net_util.h"

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

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

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

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

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

783 }	784 }

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

785 }	786 }

786	787

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

OLD	NEW