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

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: Created 7 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 #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 2024 matching lines...) Expand 10 before | Expand all | Expand 10 after
2035 2035
2036 SET_STRING("DELETED_MESSAGE_PLURAL", IDS_FILE_BROWSER_DELETED_MESSAGE_PLURAL); 2036 SET_STRING("DELETED_MESSAGE_PLURAL", IDS_FILE_BROWSER_DELETED_MESSAGE_PLURAL);
2037 SET_STRING("DELETED_MESSAGE", IDS_FILE_BROWSER_DELETED_MESSAGE); 2037 SET_STRING("DELETED_MESSAGE", IDS_FILE_BROWSER_DELETED_MESSAGE);
2038 SET_STRING("DELETE_ERROR", IDS_FILE_BROWSER_DELETE_ERROR); 2038 SET_STRING("DELETE_ERROR", IDS_FILE_BROWSER_DELETE_ERROR);
2039 SET_STRING("UNDO_DELETE", IDS_FILE_BROWSER_UNDO_DELETE); 2039 SET_STRING("UNDO_DELETE", IDS_FILE_BROWSER_UNDO_DELETE);
2040 2040
2041 SET_STRING("CANCEL_LABEL", IDS_FILE_BROWSER_CANCEL_LABEL); 2041 SET_STRING("CANCEL_LABEL", IDS_FILE_BROWSER_CANCEL_LABEL);
2042 SET_STRING("OPEN_LABEL", IDS_FILE_BROWSER_OPEN_LABEL); 2042 SET_STRING("OPEN_LABEL", IDS_FILE_BROWSER_OPEN_LABEL);
2043 SET_STRING("SAVE_LABEL", IDS_FILE_BROWSER_SAVE_LABEL); 2043 SET_STRING("SAVE_LABEL", IDS_FILE_BROWSER_SAVE_LABEL);
2044 SET_STRING("OK_LABEL", IDS_FILE_BROWSER_OK_LABEL); 2044 SET_STRING("OK_LABEL", IDS_FILE_BROWSER_OK_LABEL);
2045 SET_STRING("UPLOAD_LABEL", IDS_FILE_BROWSER_UPLOAD_LABEL);
2045 SET_STRING("VIEW_LABEL", IDS_FILE_BROWSER_VIEW_LABEL); 2046 SET_STRING("VIEW_LABEL", IDS_FILE_BROWSER_VIEW_LABEL);
2046 2047
2047 SET_STRING("DEFAULT_NEW_FOLDER_NAME", 2048 SET_STRING("DEFAULT_NEW_FOLDER_NAME",
2048 IDS_FILE_BROWSER_DEFAULT_NEW_FOLDER_NAME); 2049 IDS_FILE_BROWSER_DEFAULT_NEW_FOLDER_NAME);
2049 SET_STRING("MORE_FILES", IDS_FILE_BROWSER_MORE_FILES); 2050 SET_STRING("MORE_FILES", IDS_FILE_BROWSER_MORE_FILES);
2050 2051
2051 SET_STRING("CONFIRM_DELETE_ONE", IDS_FILE_BROWSER_CONFIRM_DELETE_ONE); 2052 SET_STRING("CONFIRM_DELETE_ONE", IDS_FILE_BROWSER_CONFIRM_DELETE_ONE);
2052 SET_STRING("CONFIRM_DELETE_SOME", IDS_FILE_BROWSER_CONFIRM_DELETE_SOME); 2053 SET_STRING("CONFIRM_DELETE_SOME", IDS_FILE_BROWSER_CONFIRM_DELETE_SOME);
2053 2054
2054 SET_STRING("UNKNOWN_FILESYSTEM_WARNING", 2055 SET_STRING("UNKNOWN_FILESYSTEM_WARNING",
(...skipping 1039 matching lines...) Expand 10 before | Expand all | Expand 10 after
3094 zoom_type = content::PAGE_ZOOM_OUT; 3095 zoom_type = content::PAGE_ZOOM_OUT;
3095 } else if (operation == "reset") { 3096 } else if (operation == "reset") {
3096 zoom_type = content::PAGE_ZOOM_RESET; 3097 zoom_type = content::PAGE_ZOOM_RESET;
3097 } else { 3098 } else {
3098 NOTREACHED(); 3099 NOTREACHED();
3099 return false; 3100 return false;
3100 } 3101 }
3101 view_host->Zoom(zoom_type); 3102 view_host->Zoom(zoom_type);
3102 return true; 3103 return true;
3103 } 3104 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698