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

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

Issue 18627002: Change dialog texts for folder upload to explicitly indicate it's for 'Uploading' (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: added comments Created 7 years, 4 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 #include "chrome/browser/chromeos/extensions/file_manager/file_browser_private_a pi.h" 5 #include "chrome/browser/chromeos/extensions/file_manager/file_browser_private_a pi.h"
6 6
7 #include <sys/stat.h> 7 #include <sys/stat.h>
8 #include <sys/statvfs.h> 8 #include <sys/statvfs.h>
9 #include <sys/types.h> 9 #include <sys/types.h>
10 #include <utime.h> 10 #include <utime.h>
(...skipping 2068 matching lines...) Expand 10 before | Expand all | Expand 10 after
2079 2079
2080 SET_STRING("DELETED_MESSAGE_PLURAL", IDS_FILE_BROWSER_DELETED_MESSAGE_PLURAL); 2080 SET_STRING("DELETED_MESSAGE_PLURAL", IDS_FILE_BROWSER_DELETED_MESSAGE_PLURAL);
2081 SET_STRING("DELETED_MESSAGE", IDS_FILE_BROWSER_DELETED_MESSAGE); 2081 SET_STRING("DELETED_MESSAGE", IDS_FILE_BROWSER_DELETED_MESSAGE);
2082 SET_STRING("DELETE_ERROR", IDS_FILE_BROWSER_DELETE_ERROR); 2082 SET_STRING("DELETE_ERROR", IDS_FILE_BROWSER_DELETE_ERROR);
2083 SET_STRING("UNDO_DELETE", IDS_FILE_BROWSER_UNDO_DELETE); 2083 SET_STRING("UNDO_DELETE", IDS_FILE_BROWSER_UNDO_DELETE);
2084 2084
2085 SET_STRING("CANCEL_LABEL", IDS_FILE_BROWSER_CANCEL_LABEL); 2085 SET_STRING("CANCEL_LABEL", IDS_FILE_BROWSER_CANCEL_LABEL);
2086 SET_STRING("OPEN_LABEL", IDS_FILE_BROWSER_OPEN_LABEL); 2086 SET_STRING("OPEN_LABEL", IDS_FILE_BROWSER_OPEN_LABEL);
2087 SET_STRING("SAVE_LABEL", IDS_FILE_BROWSER_SAVE_LABEL); 2087 SET_STRING("SAVE_LABEL", IDS_FILE_BROWSER_SAVE_LABEL);
2088 SET_STRING("OK_LABEL", IDS_FILE_BROWSER_OK_LABEL); 2088 SET_STRING("OK_LABEL", IDS_FILE_BROWSER_OK_LABEL);
2089 SET_STRING("UPLOAD_LABEL", IDS_FILE_BROWSER_UPLOAD_LABEL);
2089 SET_STRING("VIEW_LABEL", IDS_FILE_BROWSER_VIEW_LABEL); 2090 SET_STRING("VIEW_LABEL", IDS_FILE_BROWSER_VIEW_LABEL);
2090 2091
2091 SET_STRING("DEFAULT_NEW_FOLDER_NAME", 2092 SET_STRING("DEFAULT_NEW_FOLDER_NAME",
2092 IDS_FILE_BROWSER_DEFAULT_NEW_FOLDER_NAME); 2093 IDS_FILE_BROWSER_DEFAULT_NEW_FOLDER_NAME);
2093 SET_STRING("MORE_FILES", IDS_FILE_BROWSER_MORE_FILES); 2094 SET_STRING("MORE_FILES", IDS_FILE_BROWSER_MORE_FILES);
2094 2095
2095 SET_STRING("CONFIRM_DELETE_ONE", IDS_FILE_BROWSER_CONFIRM_DELETE_ONE); 2096 SET_STRING("CONFIRM_DELETE_ONE", IDS_FILE_BROWSER_CONFIRM_DELETE_ONE);
2096 SET_STRING("CONFIRM_DELETE_SOME", IDS_FILE_BROWSER_CONFIRM_DELETE_SOME); 2097 SET_STRING("CONFIRM_DELETE_SOME", IDS_FILE_BROWSER_CONFIRM_DELETE_SOME);
2097 2098
2098 SET_STRING("UNKNOWN_FILESYSTEM_WARNING", 2099 SET_STRING("UNKNOWN_FILESYSTEM_WARNING",
(...skipping 1101 matching lines...) Expand 10 before | Expand all | Expand 10 after
3200 const GURL& share_url) { 3201 const GURL& share_url) {
3201 if (error != drive::FILE_ERROR_OK) { 3202 if (error != drive::FILE_ERROR_OK) {
3202 error_ = "Share Url for this item is not available."; 3203 error_ = "Share Url for this item is not available.";
3203 SendResponse(false); 3204 SendResponse(false);
3204 return; 3205 return;
3205 } 3206 }
3206 3207
3207 SetResult(new base::StringValue(share_url.spec())); 3208 SetResult(new base::StringValue(share_url.spec()));
3208 SendResponse(true); 3209 SendResponse(true);
3209 } 3210 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698