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

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

Issue 10782038: Revert 147045 - Bring up a content settings icon for ungestured registerProtocolHandler call. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 5 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 | Annotate | Revision Log
« no previous file with comments | « chrome/common/content_settings_types.h ('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/memory/ref_counted.h" 10 #include "base/memory/ref_counted.h"
11 #include "base/memory/scoped_ptr.h" 11 #include "base/memory/scoped_ptr.h"
12 #include "base/scoped_temp_dir.h" 12 #include "base/scoped_temp_dir.h"
13 #include "base/timer.h" 13 #include "base/timer.h"
14 #include "chrome/browser/custom_handlers/protocol_handler_registry.h"
15 #include "chrome/browser/profiles/profile.h" 14 #include "chrome/browser/profiles/profile.h"
16 15
17 namespace content { 16 namespace content {
18 class MockResourceContext; 17 class MockResourceContext;
19 } 18 }
20 19
21 namespace extensions { 20 namespace extensions {
22 class ExtensionPrefs; 21 class ExtensionPrefs;
23 } 22 }
24 23
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after
102 // recreating the BookmarkModel. 101 // recreating the BookmarkModel.
103 // 102 //
104 // NOTE: this does not block until the bookmarks are loaded. For that use 103 // NOTE: this does not block until the bookmarks are loaded. For that use
105 // BlockUntilBookmarkModelLoaded. 104 // BlockUntilBookmarkModelLoaded.
106 void CreateBookmarkModel(bool delete_file); 105 void CreateBookmarkModel(bool delete_file);
107 106
108 // Creates a ProtocolHandlerRegistry. If not invoked the protocol handler 107 // Creates a ProtocolHandlerRegistry. If not invoked the protocol handler
109 // registry is NULL. 108 // registry is NULL.
110 void CreateProtocolHandlerRegistry(); 109 void CreateProtocolHandlerRegistry();
111 110
112 // Creates a ProtocolHandlerRegistry with the provided delegate.
113 void CreateProtocolHandlerRegistry(
114 ProtocolHandlerRegistry::Delegate* delegate);
115
116 // Creates a WebDataService. If not invoked, the web data service is NULL. 111 // Creates a WebDataService. If not invoked, the web data service is NULL.
117 void CreateWebDataService(); 112 void CreateWebDataService();
118 113
119 // Blocks until the BookmarkModel finishes loaded. This is NOT invoked from 114 // Blocks until the BookmarkModel finishes loaded. This is NOT invoked from
120 // CreateBookmarkModel. 115 // CreateBookmarkModel.
121 void BlockUntilBookmarkModelLoaded(); 116 void BlockUntilBookmarkModelLoaded();
122 117
123 // Blocks until TopSites finishes loading. 118 // Blocks until TopSites finishes loading.
124 void BlockUntilTopSitesLoaded(); 119 void BlockUntilTopSitesLoaded();
125 120
(...skipping 189 matching lines...) Expand 10 before | Expand all | Expand 10 after
315 // testing. 310 // testing.
316 ProfileDependencyManager* profile_dependency_manager_; 311 ProfileDependencyManager* profile_dependency_manager_;
317 312
318 scoped_ptr<content::MockResourceContext> resource_context_; 313 scoped_ptr<content::MockResourceContext> resource_context_;
319 314
320 // Weak pointer to a delegate for indicating that a profile was created. 315 // Weak pointer to a delegate for indicating that a profile was created.
321 Delegate* delegate_; 316 Delegate* delegate_;
322 }; 317 };
323 318
324 #endif // CHROME_TEST_BASE_TESTING_PROFILE_H_ 319 #endif // CHROME_TEST_BASE_TESTING_PROFILE_H_
OLDNEW
« no previous file with comments | « chrome/common/content_settings_types.h ('k') | chrome/test/base/testing_profile.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698