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

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

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

Powered by Google App Engine
This is Rietveld 408576698