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

Side by Side Diff: extensions/renderer/dispatcher.h

Issue 1821413003: Remove logic for lazy initialization of WebKit. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix test Created 4 years, 9 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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 EXTENSIONS_RENDERER_DISPATCHER_H_ 5 #ifndef EXTENSIONS_RENDERER_DISPATCHER_H_
6 #define EXTENSIONS_RENDERER_DISPATCHER_H_ 6 #define EXTENSIONS_RENDERER_DISPATCHER_H_
7 7
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <map> 10 #include <map>
(...skipping 137 matching lines...) Expand 10 before | Expand all | Expand 10 after
148 148
149 private: 149 private:
150 // The RendererPermissionsPolicyDelegateTest.CannotScriptWebstore test needs 150 // The RendererPermissionsPolicyDelegateTest.CannotScriptWebstore test needs
151 // to call the OnActivateExtension IPCs. 151 // to call the OnActivateExtension IPCs.
152 friend class ::ChromeRenderViewTest; 152 friend class ::ChromeRenderViewTest;
153 FRIEND_TEST_ALL_PREFIXES(RendererPermissionsPolicyDelegateTest, 153 FRIEND_TEST_ALL_PREFIXES(RendererPermissionsPolicyDelegateTest,
154 CannotScriptWebstore); 154 CannotScriptWebstore);
155 155
156 // RenderProcessObserver implementation: 156 // RenderProcessObserver implementation:
157 bool OnControlMessageReceived(const IPC::Message& message) override; 157 bool OnControlMessageReceived(const IPC::Message& message) override;
158 void WebKitInitialized() override;
159 void IdleNotification() override; 158 void IdleNotification() override;
160 void OnRenderProcessShutdown() override; 159 void OnRenderProcessShutdown() override;
161 160
162 void OnActivateExtension(const std::string& extension_id); 161 void OnActivateExtension(const std::string& extension_id);
163 void OnCancelSuspend(const std::string& extension_id); 162 void OnCancelSuspend(const std::string& extension_id);
164 void OnDeliverMessage(int target_port_id, const Message& message); 163 void OnDeliverMessage(int target_port_id, const Message& message);
165 void OnDispatchOnConnect(int target_port_id, 164 void OnDispatchOnConnect(int target_port_id,
166 const std::string& channel_name, 165 const std::string& channel_name,
167 const ExtensionMsg_TabConnectionInfo& source, 166 const ExtensionMsg_TabConnectionInfo& source,
168 const ExtensionMsg_ExternalConnectionInfo& info, 167 const ExtensionMsg_ExternalConnectionInfo& info,
(...skipping 122 matching lines...) Expand 10 before | Expand all | Expand 10 after
291 // Sends API requests to the extension host. 290 // Sends API requests to the extension host.
292 scoped_ptr<RequestSender> request_sender_; 291 scoped_ptr<RequestSender> request_sender_;
293 292
294 // The platforms system font family and size; 293 // The platforms system font family and size;
295 std::string system_font_family_; 294 std::string system_font_family_;
296 std::string system_font_size_; 295 std::string system_font_size_;
297 296
298 // Mapping of port IDs to tabs. If there is no tab, the value would be -1. 297 // Mapping of port IDs to tabs. If there is no tab, the value would be -1.
299 std::map<int, int> port_to_tab_id_map_; 298 std::map<int, int> port_to_tab_id_map_;
300 299
301 // True once WebKit has been initialized (and it is therefore safe to poke).
302 bool is_webkit_initialized_;
303
304 // It is important for this to come after the ScriptInjectionManager, so that 300 // It is important for this to come after the ScriptInjectionManager, so that
305 // the observer is destroyed before the UserScriptSet. 301 // the observer is destroyed before the UserScriptSet.
306 ScopedObserver<UserScriptSetManager, UserScriptSetManager::Observer> 302 ScopedObserver<UserScriptSetManager, UserScriptSetManager::Observer>
307 user_script_set_manager_observer_; 303 user_script_set_manager_observer_;
308 304
309 // Status of webrequest usage. 305 // Status of webrequest usage.
310 bool webrequest_used_; 306 bool webrequest_used_;
311 307
312 // The WebView partition ID associated with this process's storage partition, 308 // The WebView partition ID associated with this process's storage partition,
313 // if this renderer is a WebView guest render process. Otherwise, this will be 309 // if this renderer is a WebView guest render process. Otherwise, this will be
314 // empty. 310 // empty.
315 std::string webview_partition_id_; 311 std::string webview_partition_id_;
316 312
317 DISALLOW_COPY_AND_ASSIGN(Dispatcher); 313 DISALLOW_COPY_AND_ASSIGN(Dispatcher);
318 }; 314 };
319 315
320 } // namespace extensions 316 } // namespace extensions
321 317
322 #endif // EXTENSIONS_RENDERER_DISPATCHER_H_ 318 #endif // EXTENSIONS_RENDERER_DISPATCHER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698