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

Side by Side Diff: chrome_frame/utils.cc

Issue 8317018: Have Chrome Frame build its .idl artifacts into a sub-folder of SHARED_INTERMEDIATE_DIR, a global... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 years, 2 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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 #include "chrome_frame/utils.h" 5 #include "chrome_frame/utils.h"
6 6
7 #include <atlsafe.h> 7 #include <atlsafe.h>
8 #include <atlsecurity.h> 8 #include <atlsecurity.h>
9 #include <htiframe.h> 9 #include <htiframe.h>
10 #include <mshtml.h> 10 #include <mshtml.h>
(...skipping 11 matching lines...) Expand all
22 #include "base/threading/thread_local.h" 22 #include "base/threading/thread_local.h"
23 #include "base/utf_string_conversions.h" 23 #include "base/utf_string_conversions.h"
24 #include "base/win/registry.h" 24 #include "base/win/registry.h"
25 #include "base/win/scoped_bstr.h" 25 #include "base/win/scoped_bstr.h"
26 #include "base/win/scoped_comptr.h" 26 #include "base/win/scoped_comptr.h"
27 #include "base/win/scoped_variant.h" 27 #include "base/win/scoped_variant.h"
28 #include "chrome/common/automation_messages.h" 28 #include "chrome/common/automation_messages.h"
29 #include "chrome/common/chrome_paths_internal.h" 29 #include "chrome/common/chrome_paths_internal.h"
30 #include "chrome/common/url_constants.h" 30 #include "chrome/common/url_constants.h"
31 #include "chrome/installer/util/chrome_frame_distribution.h" 31 #include "chrome/installer/util/chrome_frame_distribution.h"
32 #include "chrome_frame/chrome_tab.h"
32 #include "chrome_frame/extra_system_apis.h" 33 #include "chrome_frame/extra_system_apis.h"
33 #include "chrome_frame/html_utils.h" 34 #include "chrome_frame/html_utils.h"
34 #include "chrome_frame/navigation_constraints.h" 35 #include "chrome_frame/navigation_constraints.h"
35 #include "chrome_frame/policy_settings.h" 36 #include "chrome_frame/policy_settings.h"
36 #include "chrome_frame/simple_resource_loader.h" 37 #include "chrome_frame/simple_resource_loader.h"
37 #include "googleurl/src/gurl.h" 38 #include "googleurl/src/gurl.h"
38 #include "googleurl/src/url_canon.h" 39 #include "googleurl/src/url_canon.h"
39 #include "grit/chromium_strings.h" 40 #include "grit/chromium_strings.h"
40 #include "net/base/escape.h" 41 #include "net/base/escape.h"
41 #include "net/http/http_util.h" 42 #include "net/http/http_util.h"
42 #include "ui/base/models/menu_model.h" 43 #include "ui/base/models/menu_model.h"
43 44
44 #include "chrome_tab.h" // NOLINT
45
46 using base::win::RegKey; 45 using base::win::RegKey;
47 46
48 // Note that these values are all lower case and are compared to 47 // Note that these values are all lower case and are compared to
49 // lower-case-transformed values. 48 // lower-case-transformed values.
50 const wchar_t kMetaTag[] = L"meta"; 49 const wchar_t kMetaTag[] = L"meta";
51 const wchar_t kHttpEquivAttribName[] = L"http-equiv"; 50 const wchar_t kHttpEquivAttribName[] = L"http-equiv";
52 const wchar_t kContentAttribName[] = L"content"; 51 const wchar_t kContentAttribName[] = L"content";
53 const wchar_t kXUACompatValue[] = L"x-ua-compatible"; 52 const wchar_t kXUACompatValue[] = L"x-ua-compatible";
54 const wchar_t kBodyTag[] = L"body"; 53 const wchar_t kBodyTag[] = L"body";
55 const wchar_t kChromeContentPrefix[] = L"chrome="; 54 const wchar_t kChromeContentPrefix[] = L"chrome=";
(...skipping 1578 matching lines...) Expand 10 before | Expand all | Expand 10 after
1634 ret = InternetSetOption(NULL, connection_options[option_index], 1633 ret = InternetSetOption(NULL, connection_options[option_index],
1635 &connections, connection_value_size); 1634 &connections, connection_value_size);
1636 if (!ret) { 1635 if (!ret) {
1637 return false; 1636 return false;
1638 } 1637 }
1639 } 1638 }
1640 wininet_connection_count_updated = true; 1639 wininet_connection_count_updated = true;
1641 return true; 1640 return true;
1642 } 1641 }
1643 1642
OLDNEW
« chrome_frame/resources/tlb_resource.rc ('K') | « chrome_frame/urlmon_bind_status_callback.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698