Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(409)

Side by Side Diff: chrome/browser/ui/cocoa/options/content_exceptions_window_controller.mm

Issue 6339002: [Mac] Consolidate all files relating to preferences in a subdir of c/b/ui/coc... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 years, 11 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:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #import "chrome/browser/ui/cocoa/content_exceptions_window_controller.h" 5 #import "chrome/browser/ui/cocoa/options/content_exceptions_window_controller.h"
6 6
7 #include "app/l10n_util.h" 7 #include "app/l10n_util.h"
8 #include "app/l10n_util_mac.h" 8 #include "app/l10n_util_mac.h"
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #import "base/mac/mac_util.h" 10 #import "base/mac/mac_util.h"
11 #import "base/scoped_nsobject.h" 11 #import "base/scoped_nsobject.h"
12 #include "base/sys_string_conversions.h" 12 #include "base/sys_string_conversions.h"
13 #include "chrome/browser/content_exceptions_table_model.h" 13 #include "chrome/browser/content_exceptions_table_model.h"
14 #include "chrome/browser/content_setting_combo_model.h" 14 #include "chrome/browser/content_setting_combo_model.h"
15 #include "chrome/common/notification_registrar.h" 15 #include "chrome/common/notification_registrar.h"
(...skipping 463 matching lines...) Expand 10 before | Expand all | Expand 10 after
479 479
480 // The model caches its data, meaning we need to recreate it on every change. 480 // The model caches its data, meaning we need to recreate it on every change.
481 model_.reset(new ContentExceptionsTableModel( 481 model_.reset(new ContentExceptionsTableModel(
482 settingsMap_, otrSettingsMap_, settingsType_)); 482 settingsMap_, otrSettingsMap_, settingsType_));
483 483
484 [tableView_ reloadData]; 484 [tableView_ reloadData];
485 [self adjustEditingButtons]; 485 [self adjustEditingButtons];
486 } 486 }
487 487
488 @end 488 @end
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698