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

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

Issue 10782028: Merge 142938 - [File Manager] Avoiding confusion between "Watch" and "Open" actions for video files (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1180/src/
Patch Set: Created 8 years, 5 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
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 #ifndef CHROME_BROWSER_CHROMEOS_EXTENSIONS_FILE_MANAGER_UTIL_H_ 5 #ifndef CHROME_BROWSER_CHROMEOS_EXTENSIONS_FILE_MANAGER_UTIL_H_
6 #define CHROME_BROWSER_CHROMEOS_EXTENSIONS_FILE_MANAGER_UTIL_H_ 6 #define CHROME_BROWSER_CHROMEOS_EXTENSIONS_FILE_MANAGER_UTIL_H_
7 #pragma once 7 #pragma once
8 8
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
11 11
12 #include "base/file_path.h" 12 #include "base/file_path.h"
13 #include "chrome/browser/chromeos/gdata/gdata_operation_registry.h" 13 #include "chrome/browser/chromeos/gdata/gdata_operation_registry.h"
14 #include "chrome/browser/ui/select_file_dialog.h" 14 #include "chrome/browser/ui/select_file_dialog.h"
15 #include "googleurl/src/gurl.h" 15 #include "googleurl/src/gurl.h"
16 16
17 class Browser; 17 class Browser;
18 class Profile; 18 class Profile;
19 19
20 namespace base { 20 namespace base {
21 class ListValue; 21 class ListValue;
22 } 22 }
23 23
24 extern const char kFileBrowserDomain[]; 24 extern const char kFileBrowserDomain[];
25 extern const char kFileBrowserGalleryTaskId[];
26 extern const char kFileBrowserWatchTaskId[];
25 27
26 // File manager helper methods. 28 // File manager helper methods.
27 namespace file_manager_util { 29 namespace file_manager_util {
28 30
29 // Gets base file browser url. 31 // Gets base file browser url.
30 GURL GetFileBrowserExtensionUrl(); 32 GURL GetFileBrowserExtensionUrl();
31 GURL GetFileBrowserUrl(); 33 GURL GetFileBrowserUrl();
32 GURL GetMediaPlayerUrl(); 34 GURL GetMediaPlayerUrl();
33 GURL GetVideoPlayerUrl(); 35 GURL GetVideoPlayerUrl();
34 36
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
88 bool ShouldBeOpenedWithPdfPlugin(Profile* profile, const char* file_extension); 90 bool ShouldBeOpenedWithPdfPlugin(Profile* profile, const char* file_extension);
89 91
90 // Converts the vector of progress status to their JSON (Value) form. 92 // Converts the vector of progress status to their JSON (Value) form.
91 base::ListValue* ProgressStatusVectorToListValue( 93 base::ListValue* ProgressStatusVectorToListValue(
92 Profile* profile, const GURL& origin_url, 94 Profile* profile, const GURL& origin_url,
93 const std::vector<gdata::GDataOperationRegistry::ProgressStatus>& list); 95 const std::vector<gdata::GDataOperationRegistry::ProgressStatus>& list);
94 96
95 } // namespace file_manager_util 97 } // namespace file_manager_util
96 98
97 #endif // CHROME_BROWSER_CHROMEOS_EXTENSIONS_FILE_MANAGER_UTIL_H_ 99 #endif // CHROME_BROWSER_CHROMEOS_EXTENSIONS_FILE_MANAGER_UTIL_H_
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/extensions/file_handler_util.cc ('k') | chrome/browser/resources/file_manager/js/file_manager.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698