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

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

Issue 1092953004: [Extensions] Update developerPrivate API to use base-64 data urls for icons (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Latest master Created 5 years, 8 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
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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_mang le.h" 5 #include "chrome/browser/extensions/api/developer_private/developer_private_mang le.h"
6 6
7 #include "base/memory/scoped_ptr.h" 7 #include "base/memory/scoped_ptr.h"
8 #include "base/values.h" 8 #include "base/values.h"
9 #include "chrome/common/extensions/api/developer_private.h" 9 #include "chrome/common/extensions/api/developer_private.h"
10 #include "extensions/browser/extension_error.h" 10 #include "extensions/browser/extension_error.h"
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
47 break; 47 break;
48 case api::developer_private::EXTENSION_TYPE_SHARED_MODULE: 48 case api::developer_private::EXTENSION_TYPE_SHARED_MODULE:
49 // Old api doesn't account for this. 49 // Old api doesn't account for this.
50 break; 50 break;
51 default: 51 default:
52 NOTREACHED(); 52 NOTREACHED();
53 } 53 }
54 result->allow_file_access = info.file_access.is_active; 54 result->allow_file_access = info.file_access.is_active;
55 result->wants_file_access = info.file_access.is_enabled; 55 result->wants_file_access = info.file_access.is_enabled;
56 56
57 result->icon_url = info.icon_url;
58
57 result->incognito_enabled = info.incognito_access.is_active; 59 result->incognito_enabled = info.incognito_access.is_active;
58 result->allow_incognito = info.incognito_access.is_enabled; 60 result->allow_incognito = info.incognito_access.is_enabled;
59 61
60 result->is_unpacked = 62 result->is_unpacked =
61 info.location == api::developer_private::LOCATION_UNPACKED; 63 info.location == api::developer_private::LOCATION_UNPACKED;
62 result->allow_reload = result->is_unpacked; 64 result->allow_reload = result->is_unpacked;
63 result->terminated = 65 result->terminated =
64 info.state == api::developer_private::EXTENSION_STATE_TERMINATED; 66 info.state == api::developer_private::EXTENSION_STATE_TERMINATED;
65 67
66 if (info.path) 68 if (info.path)
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
118 view_copy->generated_background_page = 120 view_copy->generated_background_page =
119 view_copy->path == kGeneratedBackgroundPageFilename; 121 view_copy->path == kGeneratedBackgroundPageFilename;
120 result->views.push_back(view_copy); 122 result->views.push_back(view_copy);
121 } 123 }
122 124
123 return result; 125 return result;
124 } 126 }
125 127
126 } // namespace developer_private_mangle 128 } // namespace developer_private_mangle
127 } // namespace extensions 129 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698