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

Side by Side Diff: chrome/browser/chromeos/file_manager/arc_file_tasks.cc

Issue 1872223002: Add verbs API to file handlers. Modify the Chrome OS UI so that it displayes the internationalized … (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebased with master and added share with verb for arc. Created 4 years, 7 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
OLDNEW
1 // Copyright (c) 2016 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2016 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/file_manager/arc_file_tasks.h" 5 #include "chrome/browser/chromeos/file_manager/arc_file_tasks.h"
6 6
7 #include <memory> 7 #include <memory>
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 119 matching lines...) Expand 10 before | Expand all | Expand 10 after
130 } 130 }
131 131
132 // TODO(kinaba): Add conversion logic once other file systems are supported. 132 // TODO(kinaba): Add conversion logic once other file systems are supported.
133 return false; 133 return false;
134 } 134 }
135 135
136 void OnArcHandlerList( 136 void OnArcHandlerList(
137 std::unique_ptr<std::vector<FullTaskDescriptor>> result_list, 137 std::unique_ptr<std::vector<FullTaskDescriptor>> result_list,
138 const FindTasksCallback& callback, 138 const FindTasksCallback& callback,
139 mojo::Array<arc::mojom::UrlHandlerInfoPtr> handlers) { 139 mojo::Array<arc::mojom::UrlHandlerInfoPtr> handlers) {
140 using extensions::api::file_manager_private::Verb;
140 for (const arc::mojom::UrlHandlerInfoPtr& handler : handlers) { 141 for (const arc::mojom::UrlHandlerInfoPtr& handler : handlers) {
141 // TODO(crbug.com/578725): Wire action to "verb" once it's implemented.
142 std::string name(handler->name); 142 std::string name(handler->name);
143 Verb handler_verb = Verb::VERB_NONE;
143 if (handler->action == arc::mojom::ActionType::SEND || 144 if (handler->action == arc::mojom::ActionType::SEND ||
144 handler->action == arc::mojom::ActionType::SEND_MULTIPLE) { 145 handler->action == arc::mojom::ActionType::SEND_MULTIPLE) {
145 name = l10n_util::GetStringFUTF8(IDS_FILE_BROWSER_SHARE_WITH_ACTION_LABEL, 146 handler_verb = Verb::VERB_SHARE_WITH;
146 base::UTF8ToUTF16(name));
147 } 147 }
148 result_list->push_back(FullTaskDescriptor( 148 result_list->push_back(FullTaskDescriptor(
149 TaskDescriptor( 149 TaskDescriptor(
150 ActivityNameToAppId(handler->package_name, handler->activity_name), 150 ActivityNameToAppId(handler->package_name, handler->activity_name),
151 TASK_TYPE_ARC_APP, ArcActionToString(handler->action)), 151 TASK_TYPE_ARC_APP, ArcActionToString(handler->action)),
152 name, 152 handler->name, handler_verb,
153 GURL(""), // TODO: get the icon 153 GURL(""), // TODO: get the icon
154 false, // is_default, 154 false, // is_default,
155 handler->action != arc::mojom::ActionType::VIEW // is_generic 155 handler->action != arc::mojom::ActionType::VIEW // is_generic
156 )); 156 ));
157 } 157 }
158 callback.Run(std::move(result_list)); 158 callback.Run(std::move(result_list));
159 } 159 }
160 160
161 } // namespace 161 } // namespace
162 162
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
223 } else { 223 } else {
224 arc_intent_helper->HandleUrlListDeprecated( 224 arc_intent_helper->HandleUrlListDeprecated(
225 std::move(urls), AppIdToActivityName(task.app_id)->package_name, 225 std::move(urls), AppIdToActivityName(task.app_id)->package_name,
226 StringToArcAction(task.action_id)); 226 StringToArcAction(task.action_id));
227 } 227 }
228 return true; 228 return true;
229 } 229 }
230 230
231 } // namespace file_tasks 231 } // namespace file_tasks
232 } // namespace file_manager 232 } // namespace file_manager
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698