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

Side by Side Diff: chrome/renderer/chrome_content_renderer_client.h

Issue 9169065: Reloading page after installing app should bring it into correct process. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixing merge conflict. Created 8 years, 10 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_RENDERER_CHROME_CONTENT_RENDERER_CLIENT_H_ 5 #ifndef CHROME_RENDERER_CHROME_CONTENT_RENDERER_CLIENT_H_
6 #define CHROME_RENDERER_CHROME_CONTENT_RENDERER_CLIENT_H_ 6 #define CHROME_RENDERER_CHROME_CONTENT_RENDERER_CLIENT_H_
7 #pragma once 7 #pragma once
8 8
9 #include <set> 9 #include <set>
10 #include <string> 10 #include <string>
(...skipping 121 matching lines...) Expand 10 before | Expand all | Expand 10 after
132 const WebKit::WebPluginParams& params, 132 const WebKit::WebPluginParams& params,
133 const ChromeViewHostMsg_GetPluginInfo_Status& status, 133 const ChromeViewHostMsg_GetPluginInfo_Status& status,
134 const webkit::WebPluginInfo& plugin, 134 const webkit::WebPluginInfo& plugin,
135 const std::string& actual_mime_type); 135 const std::string& actual_mime_type);
136 136
137 private: 137 private:
138 // Returns true if the frame is navigating to an URL either into or out of an 138 // Returns true if the frame is navigating to an URL either into or out of an
139 // extension app's extent. 139 // extension app's extent.
140 bool CrossesExtensionExtents(WebKit::WebFrame* frame, 140 bool CrossesExtensionExtents(WebKit::WebFrame* frame,
141 const GURL& new_url, 141 const GURL& new_url,
142 const ExtensionSet& extensions,
143 bool is_extension_url,
142 bool is_initial_navigation); 144 bool is_initial_navigation);
143 145
144 // Returns true if the NaCl plugin can be created. If it returns true, as a 146 // Returns true if the NaCl plugin can be created. If it returns true, as a
145 // side effect, it may add special attributes to params. 147 // side effect, it may add special attributes to params.
146 bool IsNaClAllowed(const webkit::WebPluginInfo& plugin, 148 bool IsNaClAllowed(const webkit::WebPluginInfo& plugin,
147 const GURL& url, 149 const GURL& url,
148 const std::string& actual_mime_type, 150 const std::string& actual_mime_type,
149 bool is_nacl_mime_type, 151 bool is_nacl_mime_type,
150 bool enable_nacl, 152 bool enable_nacl,
151 WebKit::WebPluginParams& params); 153 WebKit::WebPluginParams& params);
152 154
153 scoped_ptr<ChromeRenderProcessObserver> chrome_observer_; 155 scoped_ptr<ChromeRenderProcessObserver> chrome_observer_;
154 scoped_ptr<ExtensionDispatcher> extension_dispatcher_; 156 scoped_ptr<ExtensionDispatcher> extension_dispatcher_;
155 scoped_ptr<RendererHistogramSnapshots> histogram_snapshots_; 157 scoped_ptr<RendererHistogramSnapshots> histogram_snapshots_;
156 scoped_ptr<RendererNetPredictor> net_predictor_; 158 scoped_ptr<RendererNetPredictor> net_predictor_;
157 scoped_ptr<SpellCheck> spellcheck_; 159 scoped_ptr<SpellCheck> spellcheck_;
158 scoped_ptr<VisitedLinkSlave> visited_link_slave_; 160 scoped_ptr<VisitedLinkSlave> visited_link_slave_;
159 scoped_ptr<safe_browsing::PhishingClassifierFilter> phishing_classifier_; 161 scoped_ptr<safe_browsing::PhishingClassifierFilter> phishing_classifier_;
160 162
161 // Set of origins that can use TCP/UDP private APIs from NaCl. 163 // Set of origins that can use TCP/UDP private APIs from NaCl.
162 std::set<std::string> allowed_socket_origins_; 164 std::set<std::string> allowed_socket_origins_;
163 }; 165 };
164 166
165 } // namespace chrome 167 } // namespace chrome
166 168
167 #endif // CHROME_RENDERER_CHROME_CONTENT_RENDERER_CLIENT_H_ 169 #endif // CHROME_RENDERER_CHROME_CONTENT_RENDERER_CLIENT_H_
OLDNEW
« no previous file with comments | « chrome/browser/extensions/app_process_apitest.cc ('k') | chrome/renderer/chrome_content_renderer_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698