chrome_frame/np_proxy_service.h - Issue 1727021: Fix types that reached into WebCore and busted deps roll....

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: chrome_frame/np_proxy_service.h

Issue 1727021: Fix types that reached into WebCore and busted deps roll.... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Created 10 years, 7 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

« no previous file with comments | « chrome_frame/np_browser_functions.cc ('k') | chrome_frame/npapi_url_request.h » ('j') | no next file with comments »

OLD	NEW
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_NP_PROXY_SERVICE_H_	5 #ifndef CHROME_FRAME_NP_PROXY_SERVICE_H_

6 #define CHROME_FRAME_NP_PROXY_SERVICE_H_	6 #define CHROME_FRAME_NP_PROXY_SERVICE_H_

7	7

8 #include <string>	8 #include <string>

9 #include <vector>	9 #include <vector>

10 #include "base/values.h"	10 #include "base/values.h"

11 #include "base/scoped_ptr.h"	11 #include "base/scoped_ptr.h"

12	12

13 // Avoid conflicts with basictypes and the gecko sdk.	13 // Avoid conflicts with basictypes and the gecko sdk.

14 // (different definitions of uint32).	14 // (different definitions of uint32).

15 #define NO_NSPR_10_SUPPORT	15 #define NO_NSPR_10_SUPPORT

16	16

17 #include "chrome_frame/chrome_frame_automation.h"	17 #include "chrome_frame/chrome_frame_automation.h"

18 #include "chrome_frame/ns_associate_iid_win.h"	18 #include "chrome_frame/ns_associate_iid_win.h"

19 #include "chrome_frame/ns_isupports_impl.h"	19 #include "chrome_frame/ns_isupports_impl.h"

20 #include "chrome_frame/scoped_ns_ptr_win.h"	20 #include "chrome_frame/scoped_ns_ptr_win.h"

21 #include "third_party/WebKit/WebCore/bridge/npapi.h"	21 #include "third_party/npapi/bindings/npapi.h"

22 #include "third_party/xulrunner-sdk/win/include/xpcom/nsIObserver.h"	22 #include "third_party/xulrunner-sdk/win/include/xpcom/nsIObserver.h"

23 #include "third_party/xulrunner-sdk/win/include/pref/nsIPrefBranch2.h"	23 #include "third_party/xulrunner-sdk/win/include/pref/nsIPrefBranch2.h"

24 #include "third_party/xulrunner-sdk/win/include/pref/nsIPrefService.h"	24 #include "third_party/xulrunner-sdk/win/include/pref/nsIPrefService.h"

25 #include "third_party/xulrunner-sdk/win/include/xpcom/nsIServiceManager.h"	25 #include "third_party/xulrunner-sdk/win/include/xpcom/nsIServiceManager.h"

26	26

27 ASSOCIATE_IID(NS_IOBSERVER_IID_STR, nsIObserver);	27 ASSOCIATE_IID(NS_IOBSERVER_IID_STR, nsIObserver);

28 ASSOCIATE_IID(NS_ISERVICEMANAGER_IID_STR, nsIServiceManager);	28 ASSOCIATE_IID(NS_ISERVICEMANAGER_IID_STR, nsIServiceManager);

29 ASSOCIATE_IID(NS_IPREFSERVICE_IID_STR, nsIPrefService);	29 ASSOCIATE_IID(NS_IPREFSERVICE_IID_STR, nsIPrefService);

30 ASSOCIATE_IID(NS_IPREFBRANCH2_IID_STR, nsIPrefBranch2);	30 ASSOCIATE_IID(NS_IPREFBRANCH2_IID_STR, nsIPrefBranch2);

31	31

(...skipping 96 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
128 bool system_config_;	128 bool system_config_;

129 bool auto_detect_;	129 bool auto_detect_;

130 bool no_proxy_;	130 bool no_proxy_;

131 int type_;	131 int type_;

132 std::string pac_url_;	132 std::string pac_url_;

133 std::string proxy_bypass_list_;	133 std::string proxy_bypass_list_;

134 ManualProxyList manual_proxies_;	134 ManualProxyList manual_proxies_;

135 };	135 };

136	136

137 #endif // CHROME_FRAME_NP_PROXY_SERVICE_H_	137 #endif // CHROME_FRAME_NP_PROXY_SERVICE_H_

OLD	NEW