chrome/browser/ui/cocoa/options/content_settings_dialog_controller.mm - Issue 6339002: [Mac] Consolidate all files relating to preferences in a subdir of c/b/ui/coc...

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/cocoa/options/content_settings_dialog_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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/ui/cocoa/options/content_settings_dialog_controller.h ('k') | chrome/browser/ui/cocoa/options/content_settings_dialog_controller_unittest.mm » ('j') | chrome/browser/ui/cocoa/options/cookies_window_controller_unittest.mm » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/cocoa/options/content_settings_dialog_controller.mm

===================================================================

--- chrome/browser/ui/cocoa/options/content_settings_dialog_controller.mm (revision 0)

+++ chrome/browser/ui/cocoa/options/content_settings_dialog_controller.mm (working copy)

@@ -2,7 +2,7 @@

// Use of this source code is governed by a BSD-style license that can be

// found in the LICENSE file.

-#import "chrome/browser/ui/cocoa/content_settings_dialog_controller.h"

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

#import <Cocoa/Cocoa.h>

@@ -20,9 +20,9 @@

#include "chrome/browser/profiles/profile.h"

#include "chrome/browser/ui/browser.h"

#include "chrome/browser/ui/browser_window.h"

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

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

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

+#import "chrome/browser/ui/cocoa/options/content_exceptions_window_controller.h"

+#import "chrome/browser/ui/cocoa/options/cookies_window_controller.h"

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

#import "chrome/browser/ui/cocoa/tab_view_picker_table.h"

#include "chrome/common/chrome_switches.h"