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

Side by Side Diff: chrome/browser/ui/toolbar/wrench_menu_model.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/toolbar/wrench_menu_model.h" 5 #include "chrome/browser/ui/toolbar/wrench_menu_model.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <cmath> 8 #include <cmath>
9 9
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
71 #include "chrome/browser/enumerate_modules_model_win.h" 71 #include "chrome/browser/enumerate_modules_model_win.h"
72 #include "chrome/browser/ui/metro_pin_tab_helper_win.h" 72 #include "chrome/browser/ui/metro_pin_tab_helper_win.h"
73 #include "content/public/browser/gpu_data_manager.h" 73 #include "content/public/browser/gpu_data_manager.h"
74 #endif 74 #endif
75 75
76 #if defined(USE_ASH) 76 #if defined(USE_ASH)
77 #include "ash/shell.h" 77 #include "ash/shell.h"
78 #endif 78 #endif
79 79
80 using base::UserMetricsAction; 80 using base::UserMetricsAction;
81 using content::HostZoomMap;
82 using content::WebContents; 81 using content::WebContents;
83 82
84 namespace { 83 namespace {
85 // Conditionally return the update app menu item title based on upgrade detector 84 // Conditionally return the update app menu item title based on upgrade detector
86 // state. 85 // state.
87 base::string16 GetUpgradeDialogMenuItemName() { 86 base::string16 GetUpgradeDialogMenuItemName() {
88 if (UpgradeDetector::GetInstance()->is_outdated_install() || 87 if (UpgradeDetector::GetInstance()->is_outdated_install() ||
89 UpgradeDetector::GetInstance()->is_outdated_install_no_au()) { 88 UpgradeDetector::GetInstance()->is_outdated_install_no_au()) {
90 return l10n_util::GetStringUTF16(IDS_UPGRADE_BUBBLE_MENU_ITEM); 89 return l10n_util::GetStringUTF16(IDS_UPGRADE_BUBBLE_MENU_ITEM);
91 } else { 90 } else {
(...skipping 186 matching lines...) Expand 10 before | Expand all | Expand 10 after
278 277
279 WrenchMenuModel::WrenchMenuModel(ui::AcceleratorProvider* provider, 278 WrenchMenuModel::WrenchMenuModel(ui::AcceleratorProvider* provider,
280 Browser* browser) 279 Browser* browser)
281 : ui::SimpleMenuModel(this), 280 : ui::SimpleMenuModel(this),
282 provider_(provider), 281 provider_(provider),
283 browser_(browser), 282 browser_(browser),
284 tab_strip_model_(browser_->tab_strip_model()) { 283 tab_strip_model_(browser_->tab_strip_model()) {
285 Build(); 284 Build();
286 UpdateZoomControls(); 285 UpdateZoomControls();
287 286
288 content_zoom_subscription_ = content::HostZoomMap::GetForBrowserContext( 287 content_zoom_subscription_ =
289 browser->profile())->AddZoomLevelChangedCallback( 288 content::HostZoomMap::GetDefaultForBrowserContext(browser->profile())
290 base::Bind(&WrenchMenuModel::OnZoomLevelChanged, 289 ->AddZoomLevelChangedCallback(base::Bind(
291 base::Unretained(this))); 290 &WrenchMenuModel::OnZoomLevelChanged, base::Unretained(this)));
292 291
293 browser_zoom_subscription_ = ZoomEventManager::GetForBrowserContext( 292 browser_zoom_subscription_ = ZoomEventManager::GetForBrowserContext(
294 browser->profile())->AddZoomLevelChangedCallback( 293 browser->profile())->AddZoomLevelChangedCallback(
295 base::Bind(&WrenchMenuModel::OnZoomLevelChanged, 294 base::Bind(&WrenchMenuModel::OnZoomLevelChanged,
296 base::Unretained(this))); 295 base::Unretained(this)));
297 296
298 tab_strip_model_->AddObserver(this); 297 tab_strip_model_->AddObserver(this);
299 298
300 registrar_.Add(this, content::NOTIFICATION_NAV_ENTRY_COMMITTED, 299 registrar_.Add(this, content::NOTIFICATION_NAV_ENTRY_COMMITTED,
301 content::NotificationService::AllSources()); 300 content::NotificationService::AllSources());
(...skipping 493 matching lines...) Expand 10 before | Expand all | Expand 10 after
795 ->GetZoomPercent(); 794 ->GetZoomPercent();
796 } 795 }
797 zoom_label_ = l10n_util::GetStringFUTF16( 796 zoom_label_ = l10n_util::GetStringFUTF16(
798 IDS_ZOOM_PERCENT, base::IntToString16(zoom_percent)); 797 IDS_ZOOM_PERCENT, base::IntToString16(zoom_percent));
799 } 798 }
800 799
801 void WrenchMenuModel::OnZoomLevelChanged( 800 void WrenchMenuModel::OnZoomLevelChanged(
802 const content::HostZoomMap::ZoomLevelChange& change) { 801 const content::HostZoomMap::ZoomLevelChange& change) {
803 UpdateZoomControls(); 802 UpdateZoomControls();
804 } 803 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller.mm ('k') | chrome/browser/ui/views/toolbar/wrench_menu.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698