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

Side by Side Diff: chrome/test/base/testing_profile.h

Issue 678343002: Default zoom was never read from chrome://settings (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Added unit test for reading default zoom from Settings Created 6 years, 1 month 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/browser/ui/browser_commands.cc ('k') | chrome/test/base/testing_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 #ifndef CHROME_TEST_BASE_TESTING_PROFILE_H_ 5 #ifndef CHROME_TEST_BASE_TESTING_PROFILE_H_
6 #define CHROME_TEST_BASE_TESTING_PROFILE_H_ 6 #define CHROME_TEST_BASE_TESTING_PROFILE_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/files/scoped_temp_dir.h" 10 #include "base/files/scoped_temp_dir.h"
11 #include "base/memory/ref_counted.h" 11 #include "base/memory/ref_counted.h"
12 #include "base/memory/scoped_ptr.h" 12 #include "base/memory/scoped_ptr.h"
13 #include "chrome/browser/profiles/profile.h" 13 #include "chrome/browser/profiles/profile.h"
14 #include "chrome/browser/ui/zoom/chrome_zoom_level_prefs.h"
tfarina 2014/11/17 01:57:12 why did you include this here? for ChromeZoomLevel
14 #include "components/domain_reliability/clear_mode.h" 15 #include "components/domain_reliability/clear_mode.h"
15 #include "components/keyed_service/content/browser_context_keyed_service_factory .h" 16 #include "components/keyed_service/content/browser_context_keyed_service_factory .h"
16 17
17 namespace content { 18 namespace content {
18 class MockResourceContext; 19 class MockResourceContext;
19 class SSLHostStateDelegate; 20 class SSLHostStateDelegate;
20 class ZoomLevelDelegate; 21 class ZoomLevelDelegate;
21 } 22 }
22 23
23 namespace history { 24 namespace history {
(...skipping 247 matching lines...) Expand 10 before | Expand all | Expand 10 after
271 void SetExtensionSpecialStoragePolicy( 272 void SetExtensionSpecialStoragePolicy(
272 ExtensionSpecialStoragePolicy* extension_special_storage_policy); 273 ExtensionSpecialStoragePolicy* extension_special_storage_policy);
273 #endif 274 #endif
274 ExtensionSpecialStoragePolicy* GetExtensionSpecialStoragePolicy() override; 275 ExtensionSpecialStoragePolicy* GetExtensionSpecialStoragePolicy() override;
275 // TODO(ajwong): Remove this API in favor of directly retrieving the 276 // TODO(ajwong): Remove this API in favor of directly retrieving the
276 // CookieStore from the StoragePartition after ExtensionURLRequestContext 277 // CookieStore from the StoragePartition after ExtensionURLRequestContext
277 // has been removed. 278 // has been removed.
278 net::CookieMonster* GetCookieMonster(); 279 net::CookieMonster* GetCookieMonster();
279 280
280 PrefService* GetPrefs() override; 281 PrefService* GetPrefs() override;
281 282 chrome::ChromeZoomLevelPrefs* GetZoomLevelPrefs() override;
282 history::TopSites* GetTopSites() override; 283 history::TopSites* GetTopSites() override;
283 history::TopSites* GetTopSitesWithoutCreating() override; 284 history::TopSites* GetTopSitesWithoutCreating() override;
284 285
285 net::URLRequestContextGetter* GetMediaRequestContext() override; 286 net::URLRequestContextGetter* GetMediaRequestContext() override;
286 net::URLRequestContextGetter* GetMediaRequestContextForRenderProcess( 287 net::URLRequestContextGetter* GetMediaRequestContextForRenderProcess(
287 int renderer_child_id) override; 288 int renderer_child_id) override;
288 net::URLRequestContextGetter* GetRequestContextForExtensions() override; 289 net::URLRequestContextGetter* GetRequestContextForExtensions() override;
289 net::URLRequestContextGetter* GetMediaRequestContextForStoragePartition( 290 net::URLRequestContextGetter* GetMediaRequestContextForStoragePartition(
290 const base::FilePath& partition_path, 291 const base::FilePath& partition_path,
291 bool in_memory) override; 292 bool in_memory) override;
(...skipping 123 matching lines...) Expand 10 before | Expand all | Expand 10 after
415 416
416 // Weak pointer to a delegate for indicating that a profile was created. 417 // Weak pointer to a delegate for indicating that a profile was created.
417 Delegate* delegate_; 418 Delegate* delegate_;
418 419
419 std::string profile_name_; 420 std::string profile_name_;
420 421
421 scoped_ptr<policy::PolicyService> policy_service_; 422 scoped_ptr<policy::PolicyService> policy_service_;
422 }; 423 };
423 424
424 #endif // CHROME_TEST_BASE_TESTING_PROFILE_H_ 425 #endif // CHROME_TEST_BASE_TESTING_PROFILE_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/browser_commands.cc ('k') | chrome/test/base/testing_profile.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698