chrome/browser/ui/cocoa/extensions/media_galleries_dialog_cocoa_unittest.mm - Issue 15239002: Move Extension and PermissionsData to extensions/common.

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/extensions/media_galleries_dialog_cocoa_unittest.mm

Issue 15239002: Move Extension and PermissionsData to extensions/common. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase Created 7 years, 1 month 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/extensions/media_galleries_dialog_cocoa_browsertest.mm ('k') | chrome/browser/ui/cocoa/infobars/extension_infobar_controller.mm » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2012 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 #include "base/strings/string_number_conversions.h"	5 #include "base/strings/string_number_conversions.h"

6 #include "base/strings/utf_string_conversions.h"	6 #include "base/strings/utf_string_conversions.h"

7 #include "chrome/browser/media_galleries/media_galleries_dialog_controller_mock. h"	7 #include "chrome/browser/media_galleries/media_galleries_dialog_controller_mock. h"

8 #include "chrome/browser/storage_monitor/storage_info.h"	8 #include "chrome/browser/storage_monitor/storage_info.h"

9 #include "chrome/browser/ui/cocoa/extensions/media_galleries_dialog_cocoa.h"	9 #include "chrome/browser/ui/cocoa/extensions/media_galleries_dialog_cocoa.h"

10 #include "chrome/common/extensions/extension.h"

11 #include "chrome/common/extensions/extension_test_util.h"	10 #include "chrome/common/extensions/extension_test_util.h"

	11 #include "extensions/common/extension.h"

12 #include "testing/gtest/include/gtest/gtest.h"	12 #include "testing/gtest/include/gtest/gtest.h"

13	13

14 using ::testing::_;	14 using ::testing::_;

15 using ::testing::NiceMock;	15 using ::testing::NiceMock;

16 using ::testing::Return;	16 using ::testing::Return;

17 using ::testing::ReturnPointee;	17 using ::testing::ReturnPointee;

18 using ::testing::ReturnRef;	18 using ::testing::ReturnRef;

19	19

20 MediaGalleryPrefInfo MakePrefInfoForTesting(MediaGalleryPrefId pref_id) {	20 MediaGalleryPrefInfo MakePrefInfoForTesting(MediaGalleryPrefId pref_id) {

21 MediaGalleryPrefInfo gallery;	21 MediaGalleryPrefInfo gallery;

(...skipping 177 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
199	199

200 // Remove a gallery.	200 // Remove a gallery.

201 attached_permissions.erase(attached_permissions.begin());	201 attached_permissions.erase(attached_permissions.begin());

202 dialog->UpdateGalleries();	202 dialog->UpdateGalleries();

203 EXPECT_EQ(1U, [dialog->checkboxes_ count]);	203 EXPECT_EQ(1U, [dialog->checkboxes_ count]);

204	204

205 // The checkbox container should be shorter.	205 // The checkbox container should be shorter.

206 CGFloat new_container_height = NSHeight([dialog->checkbox_container_ frame]);	206 CGFloat new_container_height = NSHeight([dialog->checkbox_container_ frame]);

207 EXPECT_LT(new_container_height, old_container_height);	207 EXPECT_LT(new_container_height, old_container_height);

208 }	208 }

OLD	NEW