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

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: build fix 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 2121 matching lines...) Expand 10 before | Expand all | Expand 10 after
2132 2132
2133 SET_STRING("DELETED_MESSAGE_PLURAL", IDS_FILE_BROWSER_DELETED_MESSAGE_PLURAL); 2133 SET_STRING("DELETED_MESSAGE_PLURAL", IDS_FILE_BROWSER_DELETED_MESSAGE_PLURAL);
2134 SET_STRING("DELETED_MESSAGE", IDS_FILE_BROWSER_DELETED_MESSAGE); 2134 SET_STRING("DELETED_MESSAGE", IDS_FILE_BROWSER_DELETED_MESSAGE);
2135 SET_STRING("DELETE_ERROR", IDS_FILE_BROWSER_DELETE_ERROR); 2135 SET_STRING("DELETE_ERROR", IDS_FILE_BROWSER_DELETE_ERROR);
2136 SET_STRING("UNDO_DELETE", IDS_FILE_BROWSER_UNDO_DELETE); 2136 SET_STRING("UNDO_DELETE", IDS_FILE_BROWSER_UNDO_DELETE);
2137 2137
2138 SET_STRING("CANCEL_LABEL", IDS_FILE_BROWSER_CANCEL_LABEL); 2138 SET_STRING("CANCEL_LABEL", IDS_FILE_BROWSER_CANCEL_LABEL);
2139 SET_STRING("OPEN_LABEL", IDS_FILE_BROWSER_OPEN_LABEL); 2139 SET_STRING("OPEN_LABEL", IDS_FILE_BROWSER_OPEN_LABEL);
2140 SET_STRING("SAVE_LABEL", IDS_FILE_BROWSER_SAVE_LABEL); 2140 SET_STRING("SAVE_LABEL", IDS_FILE_BROWSER_SAVE_LABEL);
2141 SET_STRING("OK_LABEL", IDS_FILE_BROWSER_OK_LABEL); 2141 SET_STRING("OK_LABEL", IDS_FILE_BROWSER_OK_LABEL);
2142 SET_STRING("UPLOAD_LABEL", IDS_FILE_BROWSER_UPLOAD_LABEL);
2142 SET_STRING("VIEW_LABEL", IDS_FILE_BROWSER_VIEW_LABEL); 2143 SET_STRING("VIEW_LABEL", IDS_FILE_BROWSER_VIEW_LABEL);
2143 2144
2144 SET_STRING("DEFAULT_NEW_FOLDER_NAME", 2145 SET_STRING("DEFAULT_NEW_FOLDER_NAME",
2145 IDS_FILE_BROWSER_DEFAULT_NEW_FOLDER_NAME); 2146 IDS_FILE_BROWSER_DEFAULT_NEW_FOLDER_NAME);
2146 SET_STRING("MORE_FILES", IDS_FILE_BROWSER_MORE_FILES); 2147 SET_STRING("MORE_FILES", IDS_FILE_BROWSER_MORE_FILES);
2147 2148
2148 SET_STRING("CONFIRM_DELETE_ONE", IDS_FILE_BROWSER_CONFIRM_DELETE_ONE); 2149 SET_STRING("CONFIRM_DELETE_ONE", IDS_FILE_BROWSER_CONFIRM_DELETE_ONE);
2149 SET_STRING("CONFIRM_DELETE_SOME", IDS_FILE_BROWSER_CONFIRM_DELETE_SOME); 2150 SET_STRING("CONFIRM_DELETE_SOME", IDS_FILE_BROWSER_CONFIRM_DELETE_SOME);
2150 2151
2151 SET_STRING("UNKNOWN_FILESYSTEM_WARNING", 2152 SET_STRING("UNKNOWN_FILESYSTEM_WARNING",
(...skipping 1109 matching lines...) Expand 10 before | Expand all | Expand 10 after
3261 const GURL& share_url) { 3262 const GURL& share_url) {
3262 if (error != drive::FILE_ERROR_OK) { 3263 if (error != drive::FILE_ERROR_OK) {
3263 error_ = "Share Url for this item is not available."; 3264 error_ = "Share Url for this item is not available.";
3264 SendResponse(false); 3265 SendResponse(false);
3265 return; 3266 return;
3266 } 3267 }
3267 3268
3268 SetResult(new base::StringValue(share_url.spec())); 3269 SetResult(new base::StringValue(share_url.spec()));
3269 SendResponse(true); 3270 SendResponse(true);
3270 } 3271 }
OLDNEW
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/browser/chromeos/extensions/file_manager/file_manager_util.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698