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

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

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

Side by Side Diff: chrome/browser/ui/cocoa/options/content_settings_dialog_controller_unittest.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

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

OLD	NEW
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_settings_dialog_controller.h"	5 #import "chrome/browser/ui/cocoa/options/content_settings_dialog_controller.h"

6	6

7 #include "base/auto_reset.h"	7 #include "base/auto_reset.h"

8 #include "base/command_line.h"	8 #include "base/command_line.h"

9 #import "base/scoped_nsobject.h"	9 #import "base/scoped_nsobject.h"

10 #include "base/ref_counted.h"	10 #include "base/ref_counted.h"

11 #include "chrome/browser/content_settings/host_content_settings_map.h"	11 #include "chrome/browser/content_settings/host_content_settings_map.h"

12 #include "chrome/browser/geolocation/geolocation_content_settings_map.h"	12 #include "chrome/browser/geolocation/geolocation_content_settings_map.h"

13 #include "chrome/browser/notifications/desktop_notification_service.h"	13 #include "chrome/browser/notifications/desktop_notification_service.h"

14 #include "chrome/browser/prefs/pref_service.h"	14 #include "chrome/browser/prefs/pref_service.h"

15 #include "chrome/browser/ui/cocoa/browser_test_helper.h"	15 #include "chrome/browser/ui/cocoa/browser_test_helper.h"

(...skipping 264 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
280 EXPECT_EQ(setting, CONTENT_SETTING_ASK);	280 EXPECT_EQ(setting, CONTENT_SETTING_ASK);

281	281

282 [controller_ setNotificationsSettingIndex:kNotificationsDisabledIndex];	282 [controller_ setNotificationsSettingIndex:kNotificationsDisabledIndex];

283 setting =	283 setting =

284 notificationsService_->GetDefaultContentSetting();	284 notificationsService_->GetDefaultContentSetting();

285 EXPECT_EQ(setting, CONTENT_SETTING_BLOCK);	285 EXPECT_EQ(setting, CONTENT_SETTING_BLOCK);

286 }	286 }

287	287

288 } // namespace	288 } // namespace

289	289

OLD	NEW