Mac: Move prefs around in preparation for the content settings window.

chrome/browser/cocoa/browser_window_cocoa.mm

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "app/l10n_util_mac.h"
 #include "base/gfx/rect.h"
 #include "base/keyboard_codes.h"
 #include "base/logging.h"
 #include "base/sys_string_conversions.h"
 #include "chrome/app/chrome_dll_resource.h"
 #include "chrome/browser/bookmarks/bookmark_utils.h"
 #include "chrome/browser/browser_list.h"
 #import "chrome/browser/cocoa/bookmark_manager_controller.h"
 #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/chrome_browser_window.h"
 #import "chrome/browser/cocoa/clear_browsing_data_controller.h"
-#import "chrome/browser/cocoa/chrome_browser_window.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"
 #import "chrome/browser/cocoa/keyword_editor_cocoa_controller.h"
 #import "chrome/browser/cocoa/nsmenuitem_additions.h"
 #include "chrome/browser/cocoa/page_info_window_mac.h"
 #include "chrome/browser/cocoa/repost_form_warning_mac.h"
 #include "chrome/browser/cocoa/status_bubble_mac.h"
 #include "chrome/browser/cocoa/task_manager_mac.h"
 #import "chrome/browser/cocoa/theme_install_bubble_view.h"
@@ skipping 281 matching lines @@
 void BrowserWindowCocoa::ShowNewProfileDialog() {
   NOTIMPLEMENTED();
 }
 
 void BrowserWindowCocoa::ShowRepostFormWarningDialog(
     TabContents* tab_contents) {
   new RepostFormWarningMac(GetNativeHandle(), &tab_contents->controller());
 }
 
 void BrowserWindowCocoa::ShowContentSettingsWindow(
-    ContentSettingsType content_type,
+    ContentSettingsType settingsType,

[viettrungluu, 2010/02/22 00:57:40]

Being a C++ method, C++ naming rules apply. So |settings_type|.

     Profile* profile) {
-  NOTIMPLEMENTED();
+  [ContentSettingsDialogController showContentSettingsForType:settingsType
+                                                      profile:profile];
 }
 
 void BrowserWindowCocoa::ShowProfileErrorDialog(int message_id) {
   scoped_nsobject<NSAlert> alert([[NSAlert alloc] init]);
   [alert addButtonWithTitle:l10n_util::GetNSStringWithFixup(IDS_OK)];
   [alert setMessageText:l10n_util::GetNSStringWithFixup(IDS_PRODUCT_NAME)];
   [alert setInformativeText:l10n_util::GetNSStringWithFixup(message_id)];
   [alert setAlertStyle:NSWarningAlertStyle];
   [alert runModal];
 }
@@ skipping 204 matching lines @@
 void BrowserWindowCocoa::DestroyBrowser() {
   [controller_ destroyBrowser];
 
   // at this point the controller is dead (autoreleased), so
   // make sure we don't try to reference it any more.
 }
 
 NSWindow* BrowserWindowCocoa::window() const {
   return [controller_ window];
 }