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

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: Repair merge to head 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 #pragma once 7 #pragma once
8 8
9 #include <string> 9 #include <string>
10 10
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 "base/scoped_temp_dir.h" 13 #include "base/scoped_temp_dir.h"
14 #include "base/timer.h" 14 #include "base/timer.h"
15 #include "chrome/browser/custom_handlers/protocol_handler_registry.h"
15 #include "chrome/browser/profiles/profile.h" 16 #include "chrome/browser/profiles/profile.h"
16 17
17 namespace content { 18 namespace content {
18 class MockResourceContext; 19 class MockResourceContext;
19 } 20 }
20 21
21 namespace history { 22 namespace history {
22 class TopSites; 23 class TopSites;
23 } 24 }
24 25
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after
91 // recreating the BookmarkModel. 92 // recreating the BookmarkModel.
92 // 93 //
93 // NOTE: this does not block until the bookmarks are loaded. For that use 94 // NOTE: this does not block until the bookmarks are loaded. For that use
94 // BlockUntilBookmarkModelLoaded. 95 // BlockUntilBookmarkModelLoaded.
95 void CreateBookmarkModel(bool delete_file); 96 void CreateBookmarkModel(bool delete_file);
96 97
97 // Creates a ProtocolHandlerRegistry. If not invoked the protocol handler 98 // Creates a ProtocolHandlerRegistry. If not invoked the protocol handler
98 // registry is NULL. 99 // registry is NULL.
99 void CreateProtocolHandlerRegistry(); 100 void CreateProtocolHandlerRegistry();
100 101
102 // Creates a ProtocolHandlerRegistry with the provided delegate.
103 void CreateProtocolHandlerRegistry(
104 ProtocolHandlerRegistry::Delegate* delegate);
105
101 // Creates a WebDataService. If not invoked, the web data service is NULL. 106 // Creates a WebDataService. If not invoked, the web data service is NULL.
102 void CreateWebDataService(); 107 void CreateWebDataService();
103 108
104 // Blocks until the BookmarkModel finishes loaded. This is NOT invoked from 109 // Blocks until the BookmarkModel finishes loaded. This is NOT invoked from
105 // CreateBookmarkModel. 110 // CreateBookmarkModel.
106 void BlockUntilBookmarkModelLoaded(); 111 void BlockUntilBookmarkModelLoaded();
107 112
108 // Blocks until TopSites finishes loading. 113 // Blocks until TopSites finishes loading.
109 void BlockUntilTopSitesLoaded(); 114 void BlockUntilTopSitesLoaded();
110 115
(...skipping 190 matching lines...) Expand 10 before | Expand all | Expand 10 after
301 // testing. 306 // testing.
302 ProfileDependencyManager* profile_dependency_manager_; 307 ProfileDependencyManager* profile_dependency_manager_;
303 308
304 scoped_ptr<content::MockResourceContext> resource_context_; 309 scoped_ptr<content::MockResourceContext> resource_context_;
305 310
306 // Weak pointer to a delegate for indicating that a profile was created. 311 // Weak pointer to a delegate for indicating that a profile was created.
307 Delegate* delegate_; 312 Delegate* delegate_;
308 }; 313 };
309 314
310 #endif // CHROME_TEST_BASE_TESTING_PROFILE_H_ 315 #endif // CHROME_TEST_BASE_TESTING_PROFILE_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698