chrome/browser/ui/zoom/zoom_controller_unittest.cc - Issue 12211105: Move remaining non-test, non-Chrome-specific Prefs code to base/prefs/.

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/zoom/zoom_controller_unittest.cc

Issue 12211105: Move remaining non-test, non-Chrome-specific Prefs code to base/prefs/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Address review comments, merge to LKGR. Created 7 years, 10 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/zoom/zoom_controller.cc ('k') | chrome/browser/upgrade_detector.cc » ('j') | no next file with comments »

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/message_loop.h"	5 #include "base/message_loop.h"

6 #include "chrome/browser/prefs/pref_service.h"	6 #include "base/prefs/pref_service.h"

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

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

9 #include "chrome/browser/ui/zoom/zoom_controller.h"	9 #include "chrome/browser/ui/zoom/zoom_controller.h"

10 #include "chrome/browser/ui/zoom/zoom_observer.h"	10 #include "chrome/browser/ui/zoom/zoom_observer.h"

11 #include "chrome/common/pref_names.h"	11 #include "chrome/common/pref_names.h"

12 #include "chrome/test/base/chrome_render_view_host_test_harness.h"	12 #include "chrome/test/base/chrome_render_view_host_test_harness.h"

13 #include "chrome/test/base/testing_profile.h"	13 #include "chrome/test/base/testing_profile.h"

14 #include "content/public/browser/browser_thread.h"	14 #include "content/public/browser/browser_thread.h"

15 #include "content/public/browser/host_zoom_map.h"	15 #include "content/public/browser/host_zoom_map.h"

16 #include "content/public/browser/navigation_details.h"	16 #include "content/public/browser/navigation_details.h"

(...skipping 46 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
63	63

64 TEST_F(ZoomControllerTest, Observe) {	64 TEST_F(ZoomControllerTest, Observe) {

65 EXPECT_CALL(zoom_observer_, OnZoomChanged(web_contents(), false)).Times(1);	65 EXPECT_CALL(zoom_observer_, OnZoomChanged(web_contents(), false)).Times(1);

66	66

67 content::HostZoomMap* host_zoom_map =	67 content::HostZoomMap* host_zoom_map =

68 content::HostZoomMap::GetForBrowserContext(	68 content::HostZoomMap::GetForBrowserContext(

69 web_contents()->GetBrowserContext());	69 web_contents()->GetBrowserContext());

70	70

71 host_zoom_map->SetZoomLevel(std::string(), 110.0f);	71 host_zoom_map->SetZoomLevel(std::string(), 110.0f);

72 }	72 }

OLD	NEW