chrome/browser/ui/zoom/zoom_controller.cc - Issue 19073003: Update some includes of chrome_notification_types.h

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 19073003: Update some includes of chrome_notification_types.h (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

Patch Set: Created 7 years, 5 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/webui/uber/uber_ui.cc ('k') | chrome/browser/web_resource/promo_resource_service.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 "base/prefs/pref_service.h"	7 #include "base/prefs/pref_service.h"

	8 #include "chrome/browser/chrome_notification_types.h"

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

9 #include "chrome/browser/ui/browser_finder.h"	10 #include "chrome/browser/ui/browser_finder.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_details.h"	14 #include "content/public/browser/notification_details.h"

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

16 #include "content/public/browser/notification_types.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"

(...skipping 68 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
89 host != net::GetHostOrSpecFromURL(active_entry->GetURL())) {	89 host != net::GetHostOrSpecFromURL(active_entry->GetURL())) {

90 return;	90 return;

91 }	91 }

92 }	92 }

93	93

94 bool dummy;	94 bool dummy;

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

96 if (observer_)	96 if (observer_)

97 observer_->OnZoomChanged(web_contents(), !host.empty() \|\| force_bubble);	97 observer_->OnZoomChanged(web_contents(), !host.empty() \|\| force_bubble);

98 }	98 }

OLD	NEW