chrome/browser/ui/views/options/exception_editor_view.h - Issue 5574001: Move ContentSettingsDetails and Pattern out of HostContentSettingsMap as separate classes.

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/views/options/exception_editor_view.h

Issue 5574001: Move ContentSettingsDetails and Pattern out of HostContentSettingsMap as separate classes. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/chrome/browser/content_settings

Patch Set: updates Created 10 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 side-by-side diff with in-line comments

Download patch

« chrome/browser/content_settings/content_settings_details.h ('K') | « chrome/browser/ui/views/options/content_filter_page_view.cc ('k') | chrome/browser/ui/views/options/exception_editor_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/views/options/exception_editor_view.h

diff --git a/chrome/browser/ui/views/options/exception_editor_view.h b/chrome/browser/ui/views/options/exception_editor_view.h

index d88036034978167743cc5d9912e144ae6f638d44..db8ddf67a97a154371fef0aa9e5e81131ea84955 100644

--- a/chrome/browser/ui/views/options/exception_editor_view.h

+++ b/chrome/browser/ui/views/options/exception_editor_view.h

@@ -38,7 +38,7 @@ class ExceptionEditorView : public views::View,

public:

// Invoked when the user accepts the edit.

virtual void AcceptExceptionEdit(

- const HostContentSettingsMap::Pattern& pattern,

+ const ContentSettingsPattern& pattern,

ContentSetting setting,

bool is_off_the_record,

int index,

@@ -55,7 +55,7 @@ class ExceptionEditorView : public views::View,

ContentExceptionsTableModel* model,

bool allow_off_the_record,

int index,

- const HostContentSettingsMap::Pattern& pattern,

+ const ContentSettingsPattern& pattern,

ContentSetting setting,

bool is_off_the_record);

virtual ~ExceptionEditorView() {}

@@ -87,7 +87,7 @@ class ExceptionEditorView : public views::View,

// Returns true if we're adding a new item.

bool is_new() const { return index_ == -1; }

- bool IsPatternValid(const HostContentSettingsMap::Pattern& pattern,

+ bool IsPatternValid(const ContentSettingsPattern& pattern,

bool is_off_the_record) const;

void UpdateImageView(views::ImageView* image_view, bool is_valid);

@@ -99,7 +99,7 @@ class ExceptionEditorView : public views::View,

// Index of the item being edited. If -1, indices this is a new entry.

const bool allow_off_the_record_;

const int index_;

- const HostContentSettingsMap::Pattern pattern_;

+ const ContentSettingsPattern pattern_;

const ContentSetting setting_;

const bool is_off_the_record_;