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

Side by Side Diff: chrome/browser/ui/webui/options2/content_settings_handler.cc

Issue 10698140: Remove "2" suffixes from options2 code. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix tests Created 8 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/ui/webui/options2/content_settings_handler2.h" 5 #include "chrome/browser/ui/webui/options2/content_settings_handler.h"
6 6
7 #include <vector> 7 #include <vector>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/bind_helpers.h" 10 #include "base/bind_helpers.h"
11 #include "base/command_line.h" 11 #include "base/command_line.h"
12 #include "base/utf_string_conversions.h" 12 #include "base/utf_string_conversions.h"
13 #include "base/values.h" 13 #include "base/values.h"
14 #include "chrome/browser/browser_process.h" 14 #include "chrome/browser/browser_process.h"
15 #include "chrome/browser/content_settings/content_settings_details.h" 15 #include "chrome/browser/content_settings/content_settings_details.h"
(...skipping 1312 matching lines...) Expand 10 before | Expand all | Expand 10 after
1328 for (size_t i = 0; i < arraysize(kExContentSettingsTypeGroupNames); ++i) { 1328 for (size_t i = 0; i < arraysize(kExContentSettingsTypeGroupNames); ++i) {
1329 if (type == kExContentSettingsTypeGroupNames[i].type) 1329 if (type == kExContentSettingsTypeGroupNames[i].type)
1330 return kExContentSettingsTypeGroupNames[i].name; 1330 return kExContentSettingsTypeGroupNames[i].name;
1331 } 1331 }
1332 1332
1333 NOTREACHED(); 1333 NOTREACHED();
1334 return std::string(); 1334 return std::string();
1335 } 1335 }
1336 1336
1337 } // namespace options2 1337 } // namespace options2
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698