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

Side by Side Diff: chrome/renderer/chrome_render_process_observer.cc

Issue 7265009: Revert 90464 - Move app/win/* files to base/win/, ui/base/win and chrome/common/ directories. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 6 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/common/win_safe_util.cc ('k') | chrome/utility/chrome_content_utility_client.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) 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/renderer/chrome_render_process_observer.h" 5 #include "chrome/renderer/chrome_render_process_observer.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/file_util.h" 8 #include "base/file_util.h"
9 #include "base/metrics/field_trial.h" 9 #include "base/metrics/field_trial.h"
10 #include "base/metrics/histogram.h" 10 #include "base/metrics/histogram.h"
(...skipping 14 matching lines...) Expand all
25 #include "content/renderer/render_thread.h" 25 #include "content/renderer/render_thread.h"
26 #include "content/renderer/render_view.h" 26 #include "content/renderer/render_view.h"
27 #include "content/renderer/render_view_visitor.h" 27 #include "content/renderer/render_view_visitor.h"
28 #include "crypto/nss_util.h" 28 #include "crypto/nss_util.h"
29 #include "media/base/media.h" 29 #include "media/base/media.h"
30 #include "media/base/media_switches.h" 30 #include "media/base/media_switches.h"
31 #include "net/base/net_errors.h" 31 #include "net/base/net_errors.h"
32 #include "net/base/net_module.h" 32 #include "net/base/net_module.h"
33 #include "third_party/sqlite/sqlite3.h" 33 #include "third_party/sqlite/sqlite3.h"
34 #include "third_party/tcmalloc/chromium/src/google/malloc_extension.h" 34 #include "third_party/tcmalloc/chromium/src/google/malloc_extension.h"
35 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h"
35 #include "third_party/WebKit/Source/WebKit/chromium/public/WebCache.h" 36 #include "third_party/WebKit/Source/WebKit/chromium/public/WebCache.h"
36 #include "third_party/WebKit/Source/WebKit/chromium/public/WebCrossOriginPreflig htResultCache.h" 37 #include "third_party/WebKit/Source/WebKit/chromium/public/WebCrossOriginPreflig htResultCache.h"
37 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h"
38 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFontCache.h" 38 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFontCache.h"
39 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h" 39 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"
40 #include "third_party/WebKit/Source/WebKit/chromium/public/WebRuntimeFeatures.h" 40 #include "third_party/WebKit/Source/WebKit/chromium/public/WebRuntimeFeatures.h"
41 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h" 41 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"
42 #include "v8/include/v8.h" 42 #include "v8/include/v8.h"
43 43
44 #if defined(OS_WIN) 44 #if defined(OS_WIN)
45 #include "base/win/iat_patch_function.h" 45 #include "app/win/iat_patch_function.h"
46 #endif 46 #endif
47 47
48 #if defined(OS_MACOSX) 48 #if defined(OS_MACOSX)
49 #include "base/eintr_wrapper.h" 49 #include "base/eintr_wrapper.h"
50 #include "chrome/app/breakpad_mac.h" 50 #include "chrome/app/breakpad_mac.h"
51 #endif 51 #endif
52 52
53 using WebKit::WebCache; 53 using WebKit::WebCache;
54 using WebKit::WebCrossOriginPreflightResultCache; 54 using WebKit::WebCrossOriginPreflightResultCache;
55 using WebKit::WebFontCache; 55 using WebKit::WebFontCache;
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
126 } 126 }
127 127
128 private: 128 private:
129 GURL url_; 129 GURL url_;
130 ContentSettings content_settings_; 130 ContentSettings content_settings_;
131 131
132 DISALLOW_COPY_AND_ASSIGN(RenderViewContentSettingsSetter); 132 DISALLOW_COPY_AND_ASSIGN(RenderViewContentSettingsSetter);
133 }; 133 };
134 134
135 #if defined(OS_WIN) 135 #if defined(OS_WIN)
136 static base::win::IATPatchFunction g_iat_patch_createdca; 136 static app::win::IATPatchFunction g_iat_patch_createdca;
137 HDC WINAPI CreateDCAPatch(LPCSTR driver_name, 137 HDC WINAPI CreateDCAPatch(LPCSTR driver_name,
138 LPCSTR device_name, 138 LPCSTR device_name,
139 LPCSTR output, 139 LPCSTR output,
140 const void* init_data) { 140 const void* init_data) {
141 DCHECK(std::string("DISPLAY") == std::string(driver_name)); 141 DCHECK(std::string("DISPLAY") == std::string(driver_name));
142 DCHECK(!device_name); 142 DCHECK(!device_name);
143 DCHECK(!output); 143 DCHECK(!output);
144 DCHECK(!init_data); 144 DCHECK(!init_data);
145 145
146 // CreateDC fails behind the sandbox, but not CreateCompatibleDC. 146 // CreateDC fails behind the sandbox, but not CreateCompatibleDC.
147 return CreateCompatibleDC(NULL); 147 return CreateCompatibleDC(NULL);
148 } 148 }
149 149
150 static base::win::IATPatchFunction g_iat_patch_get_font_data; 150 static app::win::IATPatchFunction g_iat_patch_get_font_data;
151 DWORD WINAPI GetFontDataPatch(HDC hdc, 151 DWORD WINAPI GetFontDataPatch(HDC hdc,
152 DWORD table, 152 DWORD table,
153 DWORD offset, 153 DWORD offset,
154 LPVOID buffer, 154 LPVOID buffer,
155 DWORD length) { 155 DWORD length) {
156 int rv = GetFontData(hdc, table, offset, buffer, length); 156 int rv = GetFontData(hdc, table, offset, buffer, length);
157 if (rv == GDI_ERROR && hdc) { 157 if (rv == GDI_ERROR && hdc) {
158 HFONT font = static_cast<HFONT>(GetCurrentObject(hdc, OBJ_FONT)); 158 HFONT font = static_cast<HFONT>(GetCurrentObject(hdc, OBJ_FONT));
159 159
160 LOGFONT logfont; 160 LOGFONT logfont;
(...skipping 351 matching lines...) Expand 10 before | Expand all | Expand 10 after
512 // to free everything possible in just one pass. 512 // to free everything possible in just one pass.
513 while (!v8::V8::IdleNotification()) { 513 while (!v8::V8::IdleNotification()) {
514 } 514 }
515 515
516 #if !defined(OS_MACOSX) && defined(USE_TCMALLOC) 516 #if !defined(OS_MACOSX) && defined(USE_TCMALLOC)
517 // Tell tcmalloc to release any free pages it's still holding. 517 // Tell tcmalloc to release any free pages it's still holding.
518 MallocExtension::instance()->ReleaseFreeMemory(); 518 MallocExtension::instance()->ReleaseFreeMemory();
519 #endif 519 #endif
520 } 520 }
521 521
OLDNEW
« no previous file with comments | « chrome/common/win_safe_util.cc ('k') | chrome/utility/chrome_content_utility_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698