Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(77)

Side by Side Diff: chrome/browser/ui/zoom/zoom_controller.cc

Issue 506073002: Rename HostZoomMap::GetForBrowserContext() to GetDefaultForBrowserContext(). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 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
OLDNEW
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/chrome_notification_types.h"
9 #include "chrome/browser/profiles/profile.h" 9 #include "chrome/browser/profiles/profile.h"
10 #include "chrome/browser/ui/zoom/zoom_event_manager.h" 10 #include "chrome/browser/ui/zoom/zoom_event_manager.h"
(...skipping 22 matching lines...) Expand all
33 browser_context_(web_contents->GetBrowserContext()) { 33 browser_context_(web_contents->GetBrowserContext()) {
34 Profile* profile = 34 Profile* profile =
35 Profile::FromBrowserContext(web_contents->GetBrowserContext()); 35 Profile::FromBrowserContext(web_contents->GetBrowserContext());
36 default_zoom_level_.Init( 36 default_zoom_level_.Init(
37 prefs::kDefaultZoomLevel, 37 prefs::kDefaultZoomLevel,
38 profile->GetPrefs(), 38 profile->GetPrefs(),
39 base::Bind( 39 base::Bind(
40 &ZoomController::UpdateState, base::Unretained(this), std::string())); 40 &ZoomController::UpdateState, base::Unretained(this), std::string()));
41 zoom_level_ = default_zoom_level_.GetValue(); 41 zoom_level_ = default_zoom_level_.GetValue();
42 42
43 zoom_subscription_ = content::HostZoomMap::GetForBrowserContext( 43 zoom_subscription_ = content::HostZoomMap::GetDefaultForBrowserContext(
44 browser_context_)->AddZoomLevelChangedCallback( 44 browser_context_)->AddZoomLevelChangedCallback(
45 base::Bind(&ZoomController::OnZoomLevelChanged, 45 base::Bind(&ZoomController::OnZoomLevelChanged,
46 base::Unretained(this))); 46 base::Unretained(this)));
47 47
48 UpdateState(std::string()); 48 UpdateState(std::string());
49 } 49 }
50 50
51 ZoomController::~ZoomController() {} 51 ZoomController::~ZoomController() {}
52 52
53 bool ZoomController::IsAtDefaultZoom() const { 53 bool ZoomController::IsAtDefaultZoom() const {
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
119 zoom_mode_, 119 zoom_mode_,
120 false /* can_show_bubble */); 120 false /* can_show_bubble */);
121 FOR_EACH_OBSERVER( 121 FOR_EACH_OBSERVER(
122 ZoomObserver, observers_, OnZoomChanged(zoom_change_data)); 122 ZoomObserver, observers_, OnZoomChanged(zoom_change_data));
123 123
124 last_extension_ = NULL; 124 last_extension_ = NULL;
125 return true; 125 return true;
126 } 126 }
127 127
128 content::HostZoomMap* zoom_map = 128 content::HostZoomMap* zoom_map =
129 content::HostZoomMap::GetForBrowserContext(browser_context_); 129 content::HostZoomMap::GetDefaultForBrowserContext(browser_context_);
130 DCHECK(zoom_map); 130 DCHECK(zoom_map);
131 DCHECK(!event_data_); 131 DCHECK(!event_data_);
132 event_data_.reset(new ZoomChangedEventData(web_contents(), 132 event_data_.reset(new ZoomChangedEventData(web_contents(),
133 GetZoomLevel(), 133 GetZoomLevel(),
134 zoom_level, 134 zoom_level,
135 zoom_mode_, 135 zoom_mode_,
136 false /* can_show_bubble */)); 136 false /* can_show_bubble */));
137 int render_process_id = web_contents()->GetRenderProcessHost()->GetID(); 137 int render_process_id = web_contents()->GetRenderProcessHost()->GetID();
138 int render_view_id = web_contents()->GetRenderViewHost()->GetRoutingID(); 138 int render_view_id = web_contents()->GetRenderViewHost()->GetRoutingID();
139 if (zoom_mode_ == ZOOM_MODE_ISOLATED || 139 if (zoom_mode_ == ZOOM_MODE_ISOLATED ||
(...skipping 15 matching lines...) Expand all
155 DCHECK(!event_data_); 155 DCHECK(!event_data_);
156 last_extension_ = NULL; 156 last_extension_ = NULL;
157 return true; 157 return true;
158 } 158 }
159 159
160 void ZoomController::SetZoomMode(ZoomMode new_mode) { 160 void ZoomController::SetZoomMode(ZoomMode new_mode) {
161 if (new_mode == zoom_mode_) 161 if (new_mode == zoom_mode_)
162 return; 162 return;
163 163
164 content::HostZoomMap* zoom_map = 164 content::HostZoomMap* zoom_map =
165 content::HostZoomMap::GetForBrowserContext(browser_context_); 165 content::HostZoomMap::GetDefaultForBrowserContext(browser_context_);
166 DCHECK(zoom_map); 166 DCHECK(zoom_map);
167 int render_process_id = web_contents()->GetRenderProcessHost()->GetID(); 167 int render_process_id = web_contents()->GetRenderProcessHost()->GetID();
168 int render_view_id = web_contents()->GetRenderViewHost()->GetRoutingID(); 168 int render_view_id = web_contents()->GetRenderViewHost()->GetRoutingID();
169 double original_zoom_level = GetZoomLevel(); 169 double original_zoom_level = GetZoomLevel();
170 170
171 DCHECK(!event_data_); 171 DCHECK(!event_data_);
172 event_data_.reset(new ZoomChangedEventData(web_contents(), 172 event_data_.reset(new ZoomChangedEventData(web_contents(),
173 original_zoom_level, 173 original_zoom_level,
174 original_zoom_level, 174 original_zoom_level,
175 new_mode, 175 new_mode,
(...skipping 122 matching lines...) Expand 10 before | Expand all | Expand 10 after
298 } else { 298 } else {
299 // TODO(wjmaclean) Should we consider having HostZoomMap send both old and 299 // TODO(wjmaclean) Should we consider having HostZoomMap send both old and
300 // new zoom levels here? 300 // new zoom levels here?
301 double zoom_level = GetZoomLevel(); 301 double zoom_level = GetZoomLevel();
302 ZoomChangedEventData zoom_change_data( 302 ZoomChangedEventData zoom_change_data(
303 web_contents(), zoom_level, zoom_level, zoom_mode_, can_show_bubble); 303 web_contents(), zoom_level, zoom_level, zoom_mode_, can_show_bubble);
304 FOR_EACH_OBSERVER( 304 FOR_EACH_OBSERVER(
305 ZoomObserver, observers_, OnZoomChanged(zoom_change_data)); 305 ZoomObserver, observers_, OnZoomChanged(zoom_change_data));
306 } 306 }
307 } 307 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/options/content_settings_handler.cc ('k') | chrome/browser/ui/zoom/zoom_controller_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698