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

Side by Side Diff: chrome/browser/profiles/off_the_record_profile_impl.cc

Issue 2630583002: Add setting to isolate zoom changes by default. (Closed)
Patch Set: ... and tell closure_compiler. Created 3 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
« no previous file with comments | « chrome/app/settings_strings.grdp ('k') | chrome/browser/profiles/profile.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/profiles/off_the_record_profile_impl.h" 5 #include "chrome/browser/profiles/off_the_record_profile_impl.h"
6 6
7 #include <memory> 7 #include <memory>
8 #include <utility> 8 #include <utility>
9 9
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 232 matching lines...) Expand 10 before | Expand all | Expand 10 after
243 } 243 }
244 244
245 base::FilePath OffTheRecordProfileImpl::GetPath() const { 245 base::FilePath OffTheRecordProfileImpl::GetPath() const {
246 return profile_->GetPath(); 246 return profile_->GetPath();
247 } 247 }
248 248
249 std::unique_ptr<content::ZoomLevelDelegate> 249 std::unique_ptr<content::ZoomLevelDelegate>
250 OffTheRecordProfileImpl::CreateZoomLevelDelegate( 250 OffTheRecordProfileImpl::CreateZoomLevelDelegate(
251 const base::FilePath& partition_path) { 251 const base::FilePath& partition_path) {
252 return base::MakeUnique<ChromeZoomLevelOTRDelegate>( 252 return base::MakeUnique<ChromeZoomLevelOTRDelegate>(
253 GetPrefs(), GetPath(), partition_path,
253 zoom::ZoomEventManager::GetForBrowserContext(this)->GetWeakPtr()); 254 zoom::ZoomEventManager::GetForBrowserContext(this)->GetWeakPtr());
254 } 255 }
255 256
256 scoped_refptr<base::SequencedTaskRunner> 257 scoped_refptr<base::SequencedTaskRunner>
257 OffTheRecordProfileImpl::GetIOTaskRunner() { 258 OffTheRecordProfileImpl::GetIOTaskRunner() {
258 return profile_->GetIOTaskRunner(); 259 return profile_->GetIOTaskRunner();
259 } 260 }
260 261
261 bool OffTheRecordProfileImpl::IsOffTheRecord() const { 262 bool OffTheRecordProfileImpl::IsOffTheRecord() const {
262 return true; 263 return true;
(...skipping 291 matching lines...) Expand 10 before | Expand all | Expand 10 after
554 PrefProxyConfigTracker* OffTheRecordProfileImpl::CreateProxyConfigTracker() { 555 PrefProxyConfigTracker* OffTheRecordProfileImpl::CreateProxyConfigTracker() {
555 #if defined(OS_CHROMEOS) 556 #if defined(OS_CHROMEOS)
556 if (chromeos::ProfileHelper::IsSigninProfile(this)) { 557 if (chromeos::ProfileHelper::IsSigninProfile(this)) {
557 return ProxyServiceFactory::CreatePrefProxyConfigTrackerOfLocalState( 558 return ProxyServiceFactory::CreatePrefProxyConfigTrackerOfLocalState(
558 g_browser_process->local_state()); 559 g_browser_process->local_state());
559 } 560 }
560 #endif // defined(OS_CHROMEOS) 561 #endif // defined(OS_CHROMEOS)
561 return ProxyServiceFactory::CreatePrefProxyConfigTrackerOfProfile( 562 return ProxyServiceFactory::CreatePrefProxyConfigTrackerOfProfile(
562 GetPrefs(), g_browser_process->local_state()); 563 GetPrefs(), g_browser_process->local_state());
563 } 564 }
OLDNEW
« no previous file with comments | « chrome/app/settings_strings.grdp ('k') | chrome/browser/profiles/profile.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698