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

Side by Side Diff: chrome/browser/extensions/api/developer_private/developer_private_api.cc

Issue 22470007: Add a "key" entry to InstallWarnings, remove InstallWarning::Format (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@dc_ec_infrastructure
Patch Set: 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
« no previous file with comments | « no previous file | chrome/browser/resources/apps_debugger/js/items_list.js » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/extensions/api/developer_private/developer_private_api. h" 5 #include "chrome/browser/extensions/api/developer_private/developer_private_api. h"
6 6
7 #include "apps/app_load_service.h" 7 #include "apps/app_load_service.h"
8 #include "apps/app_restore_service.h" 8 #include "apps/app_restore_service.h"
9 #include "apps/saved_files_service.h" 9 #include "apps/saved_files_service.h"
10 #include "apps/shell_window.h" 10 #include "apps/shell_window.h"
(...skipping 286 matching lines...) Expand 10 before | Expand all | Expand 10 after
297 NOTREACHED(); 297 NOTREACHED();
298 } 298 }
299 299
300 if (Manifest::IsUnpackedLocation(item.location())) { 300 if (Manifest::IsUnpackedLocation(item.location())) {
301 info->path.reset( 301 info->path.reset(
302 new std::string(UTF16ToUTF8(item.path().LossyDisplayName()))); 302 new std::string(UTF16ToUTF8(item.path().LossyDisplayName())));
303 for (std::vector<extensions::InstallWarning>::const_iterator it = 303 for (std::vector<extensions::InstallWarning>::const_iterator it =
304 item.install_warnings().begin(); 304 item.install_warnings().begin();
305 it != item.install_warnings().end(); ++it) { 305 it != item.install_warnings().end(); ++it) {
306 developer::InstallWarning* warning = new developer::InstallWarning(); 306 developer::InstallWarning* warning = new developer::InstallWarning();
307 warning->is_html = (it->format == InstallWarning::FORMAT_HTML);
308 warning->message = it->message; 307 warning->message = it->message;
309 info->install_warnings.push_back(make_linked_ptr(warning)); 308 info->install_warnings.push_back(make_linked_ptr(warning));
310 } 309 }
311 } 310 }
312 311
313 info->incognito_enabled = service->IsIncognitoEnabled(item.id()); 312 info->incognito_enabled = service->IsIncognitoEnabled(item.id());
314 info->wants_file_access = item.wants_file_access(); 313 info->wants_file_access = item.wants_file_access();
315 info->allow_file_access = service->AllowFileAccess(&item); 314 info->allow_file_access = service->AllowFileAccess(&item);
316 info->allow_reload = Manifest::IsUnpackedLocation(item.location()); 315 info->allow_reload = Manifest::IsUnpackedLocation(item.location());
317 info->is_unpacked = Manifest::IsUnpackedLocation(item.location()); 316 info->is_unpacked = Manifest::IsUnpackedLocation(item.location());
(...skipping 962 matching lines...) Expand 10 before | Expand all | Expand 10 after
1280 1279
1281 #undef SET_STRING 1280 #undef SET_STRING
1282 return true; 1281 return true;
1283 } 1282 }
1284 1283
1285 DeveloperPrivateGetStringsFunction::~DeveloperPrivateGetStringsFunction() {} 1284 DeveloperPrivateGetStringsFunction::~DeveloperPrivateGetStringsFunction() {}
1286 1285
1287 } // namespace api 1286 } // namespace api
1288 1287
1289 } // namespace extensions 1288 } // namespace extensions
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/resources/apps_debugger/js/items_list.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698