chrome/browser/cocoa/browser_window_cocoa.mm - Issue 650124: Mac: Move prefs around in preparation for the content settings window.

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/browser_window_cocoa.mm

Issue 650124: Mac: Move prefs around in preparation for the content settings window. (Closed)

Patch Set: done? Created 10 years, 10 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/browser_window_cocoa.mm

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

index 4e5aaaf54a007dc3df25b8d5891c69fd1a981c6f..472a9c8ba0dfd9bfaa0e9ae55e44d369143717ad 100644

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

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

@@ -14,8 +14,9 @@

#include "chrome/browser/cocoa/browser_window_cocoa.h"

viettrungluu 2010/02/22 00:57:40 #include first

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

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

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

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

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

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

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

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

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

@@ -317,9 +318,10 @@ void BrowserWindowCocoa::ShowRepostFormWarningDialog(

}

void BrowserWindowCocoa::ShowContentSettingsWindow(

- ContentSettingsType content_type,

+ ContentSettingsType settingsType,

viettrungluu 2010/02/22 00:57:40 Being a C++ method, C++ naming rules apply. So |se

Profile* profile) {

- NOTIMPLEMENTED();

+ [ContentSettingsDialogController showContentSettingsForType:settingsType

+ profile:profile];

}

void BrowserWindowCocoa::ShowProfileErrorDialog(int message_id) {