chrome/browser/ui/zoom/zoom_controller.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.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/window_snapshot/window_snapshot.cc ('k') | chrome/browser/ui/zoom/zoom_controller_unittest.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 "chrome/browser/ui/zoom/zoom_controller.h"	5 #include "chrome/browser/ui/zoom/zoom_controller.h"

6	6

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

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

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

10 #include "chrome/common/chrome_notification_types.h"	10 #include "chrome/common/chrome_notification_types.h"

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

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

13 #include "content/public/browser/navigation_entry.h"	13 #include "content/public/browser/navigation_entry.h"

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

15 #include "content/public/browser/notification_details.h"	14 #include "content/public/browser/notification_details.h"

16 #include "content/public/browser/notification_service.h"	15 #include "content/public/browser/notification_service.h"

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

17 #include "content/public/browser/web_contents.h"	17 #include "content/public/browser/web_contents.h"

18 #include "content/public/common/page_zoom.h"	18 #include "content/public/common/page_zoom.h"

19 #include "grit/theme_resources.h"	19 #include "grit/theme_resources.h"

20 #include "net/base/net_util.h"	20 #include "net/base/net_util.h"

21	21

22 DEFINE_WEB_CONTENTS_USER_DATA_KEY(ZoomController);	22 DEFINE_WEB_CONTENTS_USER_DATA_KEY(ZoomController);

23	23

24 ZoomController::ZoomController(content::WebContents* web_contents)	24 ZoomController::ZoomController(content::WebContents* web_contents)

25 : content::WebContentsObserver(web_contents),	25 : content::WebContentsObserver(web_contents),

26 zoom_percent_(100),	26 zoom_percent_(100),

(...skipping 56 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
83 return;	83 return;

84 }	84 }

85 }	85 }

86	86

87 bool dummy;	87 bool dummy;

88 zoom_percent_ = web_contents()->GetZoomPercent(&dummy, &dummy);	88 zoom_percent_ = web_contents()->GetZoomPercent(&dummy, &dummy);

89	89

90 if (observer_)	90 if (observer_)

91 observer_->OnZoomChanged(web_contents(), !host.empty());	91 observer_->OnZoomChanged(web_contents(), !host.empty());

92 }	92 }

OLD	NEW