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

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

Issue 11866004: Add scheme to HostZoomMap (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Few more fixes Created 7 years, 11 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/profiles/profile_impl.h" 5 #include "chrome/browser/profiles/profile_impl.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/callback.h" 8 #include "base/callback.h"
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.h"
(...skipping 539 matching lines...) Expand 10 before | Expand all | Expand 10 after
550 const std::string& host(*i); 550 const std::string& host(*i);
551 double zoom_level = 0; 551 double zoom_level = 0;
552 552
553 bool success = host_zoom_dictionary->GetDoubleWithoutPathExpansion( 553 bool success = host_zoom_dictionary->GetDoubleWithoutPathExpansion(
554 host, &zoom_level); 554 host, &zoom_level);
555 DCHECK(success); 555 DCHECK(success);
556 host_zoom_map->SetZoomLevel(host, zoom_level); 556 host_zoom_map->SetZoomLevel(host, zoom_level);
557 } 557 }
558 } 558 }
559 559
560 #if defined(OS_CHROMEOS)
561 double no_zoom = 0;
562 host_zoom_map->SetZoomLevel(chrome::kChromeUIUberHost,
563 chrome::kChromeUIOobeHost,
564 no_zoom);
565 host_zoom_map->SetZoomLevel(chrome::kChromeUIUberHost,
566 chrome::kChromeUILoginHost,
567 no_zoom);
568 host_zoom_map->SetZoomLevel(chrome::kChromeUIUberHost,
569 chrome::kChromeUILockScreenHost,
570 no_zoom);
571 #endif
572
560 registrar_.Add(this, content::NOTIFICATION_ZOOM_LEVEL_CHANGED, 573 registrar_.Add(this, content::NOTIFICATION_ZOOM_LEVEL_CHANGED,
561 content::Source<HostZoomMap>(host_zoom_map)); 574 content::Source<HostZoomMap>(host_zoom_map));
562 } 575 }
563 576
564 FilePath ProfileImpl::last_selected_directory() { 577 FilePath ProfileImpl::last_selected_directory() {
565 return GetPrefs()->GetFilePath(prefs::kSelectFileLastDirectory); 578 return GetPrefs()->GetFilePath(prefs::kSelectFileLastDirectory);
566 } 579 }
567 580
568 void ProfileImpl::set_last_selected_directory(const FilePath& path) { 581 void ProfileImpl::set_last_selected_directory(const FilePath& path) {
569 GetPrefs()->SetFilePath(prefs::kSelectFileLastDirectory, path); 582 GetPrefs()->SetFilePath(prefs::kSelectFileLastDirectory, path);
(...skipping 565 matching lines...) Expand 10 before | Expand all | Expand 10 after
1135 if (!path.empty()) 1148 if (!path.empty())
1136 *cache_path = path; 1149 *cache_path = path;
1137 *max_size = is_media_context ? prefs_->GetInteger(prefs::kMediaCacheSize) : 1150 *max_size = is_media_context ? prefs_->GetInteger(prefs::kMediaCacheSize) :
1138 prefs_->GetInteger(prefs::kDiskCacheSize); 1151 prefs_->GetInteger(prefs::kDiskCacheSize);
1139 } 1152 }
1140 1153
1141 base::Callback<ChromeURLDataManagerBackend*(void)> 1154 base::Callback<ChromeURLDataManagerBackend*(void)>
1142 ProfileImpl::GetChromeURLDataManagerBackendGetter() const { 1155 ProfileImpl::GetChromeURLDataManagerBackendGetter() const {
1143 return io_data_.GetChromeURLDataManagerBackendGetter(); 1156 return io_data_.GetChromeURLDataManagerBackendGetter();
1144 } 1157 }
OLDNEW
« no previous file with comments | « no previous file | content/browser/host_zoom_map_impl.h » ('j') | content/browser/host_zoom_map_impl.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698