chrome/browser/cocoa/content_settings_dialog_controller.mm - Issue 2835031: Rename GeolocationExceptionsView, make it more reusable.

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/cocoa/content_settings_dialog_controller.mm

Issue 2835031: Rename GeolocationExceptionsView, make it more reusable. (Closed)

Patch Set: comments Created 10 years, 6 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/cocoa/content_settings_dialog_controller.mm

diff --git a/chrome/browser/cocoa/content_settings_dialog_controller.mm b/chrome/browser/cocoa/content_settings_dialog_controller.mm

index c635a9571bb0ad1426f7bf0d8cc7fa272ab8d872..a981a0fc47b52b67df1428a97a6b73befb424a21 100644

--- a/chrome/browser/cocoa/content_settings_dialog_controller.mm

+++ b/chrome/browser/cocoa/content_settings_dialog_controller.mm

@@ -12,9 +12,10 @@

#include "chrome/browser/browser_window.h"

#import "chrome/browser/cocoa/content_exceptions_window_controller.h"

#import "chrome/browser/cocoa/cookies_window_controller.h"

-#import "chrome/browser/cocoa/geolocation_exceptions_window_controller.h"

+#import "chrome/browser/cocoa/simple_content_exceptions_window_controller.h"

#import "chrome/browser/cocoa/l10n_util.h"

#import "chrome/browser/geolocation/geolocation_content_settings_map.h"

+#import "chrome/browser/geolocation/geolocation_exceptions_table_model.h"

#import "chrome/browser/host_content_settings_map.h"

#include "chrome/browser/pref_service.h"

#include "chrome/browser/profile.h"

@@ -324,7 +325,9 @@ class PrefObserverDisabler {

- (IBAction)showGeolocationExceptions:(id)sender {

GeolocationContentSettingsMap* settingsMap =

profile_->GetGeolocationContentSettingsMap();

- [[GeolocationExceptionsWindowController controllerWithSettingsMap:settingsMap]

+ GeolocationExceptionsTableModel* model = // Freed by window controller.

+ new GeolocationExceptionsTableModel(settingsMap);

+ [[SimpleContentExceptionsWindowController controllerWithTableModel:model]

attachSheetTo:[self window]];

}