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

Side by Side Diff: chrome/browser/extensions/api/downloads/downloads_api.cc

Issue 815363002: replace COMPILE_ASSERT with static_assert in chrome/browser/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: address comments Created 6 years 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 (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/downloads/downloads_api.h" 5 #include "chrome/browser/extensions/api/downloads/downloads_api.h"
6 6
7 #include <set> 7 #include <set>
8 #include <string> 8 #include <string>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
(...skipping 160 matching lines...) Expand 10 before | Expand all | Expand 10 after
171 kDangerSafe, 171 kDangerSafe,
172 kDangerFile, 172 kDangerFile,
173 kDangerUrl, 173 kDangerUrl,
174 kDangerContent, 174 kDangerContent,
175 kDangerSafe, 175 kDangerSafe,
176 kDangerUncommon, 176 kDangerUncommon,
177 kDangerAccepted, 177 kDangerAccepted,
178 kDangerHost, 178 kDangerHost,
179 kDangerUnwanted 179 kDangerUnwanted
180 }; 180 };
181 COMPILE_ASSERT(arraysize(kDangerStrings) == content::DOWNLOAD_DANGER_TYPE_MAX, 181 static_assert(arraysize(kDangerStrings) == content::DOWNLOAD_DANGER_TYPE_MAX,
182 download_danger_type_enum_changed); 182 "kDangerStrings should have DOWNLOAD_DANGER_TYPE_MAX elements");
183 183
184 // Note: Any change to the state strings, should be accompanied by a 184 // Note: Any change to the state strings, should be accompanied by a
185 // corresponding change to downloads.json. 185 // corresponding change to downloads.json.
186 const char* const kStateStrings[] = { 186 const char* const kStateStrings[] = {
187 kStateInProgress, 187 kStateInProgress,
188 kStateComplete, 188 kStateComplete,
189 kStateInterrupted, 189 kStateInterrupted,
190 kStateInterrupted, 190 kStateInterrupted,
191 }; 191 };
192 COMPILE_ASSERT(arraysize(kStateStrings) == DownloadItem::MAX_DOWNLOAD_STATE, 192 static_assert(arraysize(kStateStrings) == DownloadItem::MAX_DOWNLOAD_STATE,
193 download_item_state_enum_changed); 193 "kStateStrings should have MAX_DOWNLOAD_STATE elements");
194 194
195 const char* DangerString(content::DownloadDangerType danger) { 195 const char* DangerString(content::DownloadDangerType danger) {
196 DCHECK(danger >= 0); 196 DCHECK(danger >= 0);
197 DCHECK(danger < static_cast<content::DownloadDangerType>( 197 DCHECK(danger < static_cast<content::DownloadDangerType>(
198 arraysize(kDangerStrings))); 198 arraysize(kDangerStrings)));
199 if (danger < 0 || danger >= static_cast<content::DownloadDangerType>( 199 if (danger < 0 || danger >= static_cast<content::DownloadDangerType>(
200 arraysize(kDangerStrings))) 200 arraysize(kDangerStrings)))
201 return ""; 201 return "";
202 return kDangerStrings[danger]; 202 return kDangerStrings[danger];
203 } 203 }
(...skipping 1729 matching lines...) Expand 10 before | Expand all | Expand 10 after
1933 const Extension* extension, 1933 const Extension* extension,
1934 UnloadedExtensionInfo::Reason reason) { 1934 UnloadedExtensionInfo::Reason reason) {
1935 DCHECK_CURRENTLY_ON(BrowserThread::UI); 1935 DCHECK_CURRENTLY_ON(BrowserThread::UI);
1936 std::set<const Extension*>::iterator iter = 1936 std::set<const Extension*>::iterator iter =
1937 shelf_disabling_extensions_.find(extension); 1937 shelf_disabling_extensions_.find(extension);
1938 if (iter != shelf_disabling_extensions_.end()) 1938 if (iter != shelf_disabling_extensions_.end())
1939 shelf_disabling_extensions_.erase(iter); 1939 shelf_disabling_extensions_.erase(iter);
1940 } 1940 }
1941 1941
1942 } // namespace extensions 1942 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698