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

Side by Side Diff: chrome_frame/chrome_frame_npapi.h

Issue 5814004: Fixing a regression introduced with r69101, which now prevents Chrome Frame... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 10 years 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_frame/chrome_frame_activex_base.h ('k') | chrome_frame/chrome_frame_npapi.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) 2009 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2009 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_FRAME_CHROME_FRAME_NPAPI_H_ 5 #ifndef CHROME_FRAME_CHROME_FRAME_NPAPI_H_
6 #define CHROME_FRAME_CHROME_FRAME_NPAPI_H_ 6 #define CHROME_FRAME_CHROME_FRAME_NPAPI_H_
7 7
8 #include <atlbase.h> 8 #include <atlbase.h>
9 #include <atlwin.h> 9 #include <atlwin.h>
10 #include <string> 10 #include <string>
11 11
12 #include "chrome_frame/chrome_frame_automation.h" 12 #include "chrome_frame/chrome_frame_automation.h"
13 #include "chrome_frame/chrome_frame_plugin.h" 13 #include "chrome_frame/chrome_frame_plugin.h"
14 #include "chrome_frame/navigation_constraints.h"
15 #include "chrome_frame/np_browser_functions.h" 14 #include "chrome_frame/np_browser_functions.h"
16 #include "chrome_frame/np_event_listener.h" 15 #include "chrome_frame/np_event_listener.h"
17 #include "chrome_frame/np_proxy_service.h" 16 #include "chrome_frame/np_proxy_service.h"
18 #include "chrome_frame/npapi_url_request.h" 17 #include "chrome_frame/npapi_url_request.h"
19 18
20 class MessageLoop; 19 class MessageLoop;
21 class nsICookieService; 20 class nsICookieService;
22 class nsIURI; 21 class nsIURI;
23 22
24 // ChromeFrameNPAPI: Implementation of the NPAPI plugin, which is responsible 23 // ChromeFrameNPAPI: Implementation of the NPAPI plugin, which is responsible
25 // for hosting a chrome frame, i.e. an iframe like widget which hosts the the 24 // for hosting a chrome frame, i.e. an iframe like widget which hosts the the
26 // chrome window. This object delegates to Chrome.exe (via the Chrome 25 // chrome window. This object delegates to Chrome.exe (via the Chrome
27 // IPC-based automation mechanism) for the actual rendering. 26 // IPC-based automation mechanism) for the actual rendering.
28 class ChromeFrameNPAPI 27 class ChromeFrameNPAPI
29 : public CWindowImpl<ChromeFrameNPAPI>, 28 : public CWindowImpl<ChromeFrameNPAPI>,
30 public ChromeFramePlugin<ChromeFrameNPAPI>, 29 public ChromeFramePlugin<ChromeFrameNPAPI>,
31 public NpEventDelegate, 30 public NpEventDelegate {
32 public NavigationConstraintsImpl {
33 public: 31 public:
34 typedef ChromeFramePlugin<ChromeFrameNPAPI> Base; 32 typedef ChromeFramePlugin<ChromeFrameNPAPI> Base;
35 33
36 // NPObject structure which is exposed by us. 34 // NPObject structure which is exposed by us.
37 struct ChromeFrameNPObject : public NPObject { 35 struct ChromeFrameNPObject : public NPObject {
38 NPP npp; 36 NPP npp;
39 ChromeFrameNPAPI* chrome_frame_plugin_instance; 37 ChromeFrameNPAPI* chrome_frame_plugin_instance;
40 }; 38 };
41 39
42 typedef enum { 40 typedef enum {
(...skipping 305 matching lines...) Expand 10 before | Expand all | Expand 10 after
348 // The value of src property keeping the current URL. 346 // The value of src property keeping the current URL.
349 std::string src_; 347 std::string src_;
350 // Used to fetch network resources when host network stack is in use. 348 // Used to fetch network resources when host network stack is in use.
351 NPAPIUrlRequestManager url_fetcher_; 349 NPAPIUrlRequestManager url_fetcher_;
352 350
353 // Set if we receive a navigation request before initializing Chrome. 351 // Set if we receive a navigation request before initializing Chrome.
354 bool navigate_after_initialization_; 352 bool navigate_after_initialization_;
355 }; 353 };
356 354
357 #endif // CHROME_FRAME_CHROME_FRAME_NPAPI_H_ 355 #endif // CHROME_FRAME_CHROME_FRAME_NPAPI_H_
OLDNEW
« no previous file with comments | « chrome_frame/chrome_frame_activex_base.h ('k') | chrome_frame/chrome_frame_npapi.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698