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

Side by Side Diff: chrome/browser/extensions/extension_file_browser_private_api.cc

Issue 7067020: Moving mediaplayer to the chrome filebrowser. Observable behaviour should not change. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Resolved conflicts. Created 9 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/extensions/extension_file_browser_private_api.h" 5 #include "chrome/browser/extensions/extension_file_browser_private_api.h"
6 6
7 #include "base/base64.h" 7 #include "base/base64.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/json/json_writer.h" 9 #include "base/json/json_writer.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
(...skipping 1056 matching lines...) Expand 10 before | Expand all | Expand 10 after
1067 SET_STRING(IDS_FILE_BROWSER, SELECT_FOLDER_TITLE); 1067 SET_STRING(IDS_FILE_BROWSER, SELECT_FOLDER_TITLE);
1068 SET_STRING(IDS_FILE_BROWSER, SELECT_OPEN_FILE_TITLE); 1068 SET_STRING(IDS_FILE_BROWSER, SELECT_OPEN_FILE_TITLE);
1069 SET_STRING(IDS_FILE_BROWSER, SELECT_OPEN_MULTI_FILE_TITLE); 1069 SET_STRING(IDS_FILE_BROWSER, SELECT_OPEN_MULTI_FILE_TITLE);
1070 SET_STRING(IDS_FILE_BROWSER, SELECT_SAVEAS_FILE_TITLE); 1070 SET_STRING(IDS_FILE_BROWSER, SELECT_SAVEAS_FILE_TITLE);
1071 1071
1072 SET_STRING(IDS_FILE_BROWSER, COMPUTING_SELECTION); 1072 SET_STRING(IDS_FILE_BROWSER, COMPUTING_SELECTION);
1073 SET_STRING(IDS_FILE_BROWSER, NOTHING_SELECTED); 1073 SET_STRING(IDS_FILE_BROWSER, NOTHING_SELECTED);
1074 SET_STRING(IDS_FILE_BROWSER, ONE_FILE_SELECTED); 1074 SET_STRING(IDS_FILE_BROWSER, ONE_FILE_SELECTED);
1075 SET_STRING(IDS_FILE_BROWSER, MANY_FILES_SELECTED); 1075 SET_STRING(IDS_FILE_BROWSER, MANY_FILES_SELECTED);
1076 1076
1077 SET_STRING(IDS_FILE_BROWSER, PLAYBACK_ERROR);
1078
1077 // FILEBROWSER, without the underscore, is from the old school codebase. 1079 // FILEBROWSER, without the underscore, is from the old school codebase.
1078 // TODO(rginda): Move these into IDS_FILE_BROWSER post M12. 1080 // TODO(rginda): Move these into IDS_FILE_BROWSER post M12.
1079 SET_STRING(IDS_FILEBROWSER, CONFIRM_DELETE); 1081 SET_STRING(IDS_FILEBROWSER, CONFIRM_DELETE);
1080 1082
1081 SET_STRING(IDS_FILEBROWSER, ENQUEUE); 1083 SET_STRING(IDS_FILEBROWSER, ENQUEUE);
1082 #undef SET_STRING 1084 #undef SET_STRING
1083 1085
1084 // TODO(serya): Create a new string in .grd file for this one in M13. 1086 // TODO(serya): Create a new string in .grd file for this one in M13.
1085 dict->SetString("PREVIEW_IMAGE", 1087 dict->SetString("PREVIEW_IMAGE",
1086 l10n_util::GetStringUTF16(IDS_CERT_MANAGER_VIEW_CERT_BUTTON)); 1088 l10n_util::GetStringUTF16(IDS_CERT_MANAGER_VIEW_CERT_BUTTON));
1087 dict->SetString("PLAY_MEDIA", 1089 dict->SetString("PLAY_MEDIA",
1088 l10n_util::GetStringUTF16(IDS_CONTENT_CONTEXT_PLAY)); 1090 l10n_util::GetStringUTF16(IDS_CONTENT_CONTEXT_PLAY));
1089 1091
1090 return true; 1092 return true;
1091 } 1093 }
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/media/media_player_browsertest.cc ('k') | chrome/browser/extensions/extension_function_dispatcher.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698