chrome/browser/ui/webui/options2/content_settings_handler.h - Issue 10698140: Remove "2" suffixes from options2 code.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/webui/options2/content_settings_handler.h

Issue 10698140: Remove "2" suffixes from options2 code. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase 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:

Index: chrome/browser/ui/webui/options2/content_settings_handler.h

diff --git a/chrome/browser/ui/webui/options2/content_settings_handler2.h b/chrome/browser/ui/webui/options2/content_settings_handler.h

similarity index 98%

rename from chrome/browser/ui/webui/options2/content_settings_handler2.h

rename to chrome/browser/ui/webui/options2/content_settings_handler.h

index 873e987ea9fa07643c6373d8e2f0c07869a3ce33..43da1c3446a27cad46aadec440ad8fc2a7331db4 100644

--- a/chrome/browser/ui/webui/options2/content_settings_handler2.h

+++ b/chrome/browser/ui/webui/options2/content_settings_handler.h

@@ -2,8 +2,8 @@

// Use of this source code is governed by a BSD-style license that can be

// found in the LICENSE file.

-#ifndef CHROME_BROWSER_UI_WEBUI_OPTIONS2_CONTENT_SETTINGS_HANDLER2_H_

-#define CHROME_BROWSER_UI_WEBUI_OPTIONS2_CONTENT_SETTINGS_HANDLER2_H_

+#ifndef CHROME_BROWSER_UI_WEBUI_OPTIONS2_CONTENT_SETTINGS_HANDLER_H_

+#define CHROME_BROWSER_UI_WEBUI_OPTIONS2_CONTENT_SETTINGS_HANDLER_H_

#pragma once

#include <map>

@@ -12,7 +12,7 @@

#include "base/memory/scoped_ptr.h"

#include "chrome/browser/pepper_flash_settings_manager.h"

#include "chrome/browser/prefs/pref_change_registrar.h"

-#include "chrome/browser/ui/webui/options2/options_ui2.h"

+#include "chrome/browser/ui/webui/options2/options_ui.h"

#include "chrome/common/content_settings_types.h"

#include "chrome/common/content_settings.h"

#include "content/public/browser/notification_observer.h"

@@ -184,4 +184,4 @@ class ContentSettingsHandler : public OptionsPageUIHandler,

} // namespace options2

-#endif // CHROME_BROWSER_UI_WEBUI_OPTIONS2_CONTENT_SETTINGS_HANDLER2_H_

+#endif // CHROME_BROWSER_UI_WEBUI_OPTIONS2_CONTENT_SETTINGS_HANDLER_H_