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

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

Issue 7231016: 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: brettw review 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 12 matching lines...) Expand all
23 #include "content/common/resource_dispatcher_delegate.h" 23 #include "content/common/resource_dispatcher_delegate.h"
24 #include "content/common/view_messages.h" 24 #include "content/common/view_messages.h"
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"
34 #include "third_party/tcmalloc/chromium/src/google/malloc_extension.h"
35 #include "third_party/WebKit/Source/WebKit/chromium/public/WebCache.h" 33 #include "third_party/WebKit/Source/WebKit/chromium/public/WebCache.h"
36 #include "third_party/WebKit/Source/WebKit/chromium/public/WebCrossOriginPreflig htResultCache.h" 34 #include "third_party/WebKit/Source/WebKit/chromium/public/WebCrossOriginPreflig htResultCache.h"
37 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFontCache.h" 35 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFontCache.h"
38 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h" 36 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"
39 #include "third_party/WebKit/Source/WebKit/chromium/public/WebRuntimeFeatures.h" 37 #include "third_party/WebKit/Source/WebKit/chromium/public/WebRuntimeFeatures.h"
40 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h" 38 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"
39 #include "third_party/sqlite/sqlite3.h"
40 #include "third_party/tcmalloc/chromium/src/google/malloc_extension.h"
41 #include "v8/include/v8.h" 41 #include "v8/include/v8.h"
42 42
43 #if defined(OS_WIN) 43 #if defined(OS_WIN)
44 #include "app/win/iat_patch_function.h" 44 #include "base/win/iat_patch_function.h"
45 #endif 45 #endif
46 46
47 #if defined(OS_MACOSX) 47 #if defined(OS_MACOSX)
48 #include "base/eintr_wrapper.h" 48 #include "base/eintr_wrapper.h"
49 #include "chrome/app/breakpad_mac.h" 49 #include "chrome/app/breakpad_mac.h"
50 #endif 50 #endif
51 51
52 using WebKit::WebCache; 52 using WebKit::WebCache;
53 using WebKit::WebCrossOriginPreflightResultCache; 53 using WebKit::WebCrossOriginPreflightResultCache;
54 using WebKit::WebFontCache; 54 using WebKit::WebFontCache;
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
125 } 125 }
126 126
127 private: 127 private:
128 GURL url_; 128 GURL url_;
129 ContentSettings content_settings_; 129 ContentSettings content_settings_;
130 130
131 DISALLOW_COPY_AND_ASSIGN(RenderViewContentSettingsSetter); 131 DISALLOW_COPY_AND_ASSIGN(RenderViewContentSettingsSetter);
132 }; 132 };
133 133
134 #if defined(OS_WIN) 134 #if defined(OS_WIN)
135 static app::win::IATPatchFunction g_iat_patch_createdca; 135 static base::win::IATPatchFunction g_iat_patch_createdca;
136 HDC WINAPI CreateDCAPatch(LPCSTR driver_name, 136 HDC WINAPI CreateDCAPatch(LPCSTR driver_name,
137 LPCSTR device_name, 137 LPCSTR device_name,
138 LPCSTR output, 138 LPCSTR output,
139 const void* init_data) { 139 const void* init_data) {
140 DCHECK(std::string("DISPLAY") == std::string(driver_name)); 140 DCHECK(std::string("DISPLAY") == std::string(driver_name));
141 DCHECK(!device_name); 141 DCHECK(!device_name);
142 DCHECK(!output); 142 DCHECK(!output);
143 DCHECK(!init_data); 143 DCHECK(!init_data);
144 144
145 // CreateDC fails behind the sandbox, but not CreateCompatibleDC. 145 // CreateDC fails behind the sandbox, but not CreateCompatibleDC.
146 return CreateCompatibleDC(NULL); 146 return CreateCompatibleDC(NULL);
147 } 147 }
148 148
149 static app::win::IATPatchFunction g_iat_patch_get_font_data; 149 static base::win::IATPatchFunction g_iat_patch_get_font_data;
150 DWORD WINAPI GetFontDataPatch(HDC hdc, 150 DWORD WINAPI GetFontDataPatch(HDC hdc,
151 DWORD table, 151 DWORD table,
152 DWORD offset, 152 DWORD offset,
153 LPVOID buffer, 153 LPVOID buffer,
154 DWORD length) { 154 DWORD length) {
155 int rv = GetFontData(hdc, table, offset, buffer, length); 155 int rv = GetFontData(hdc, table, offset, buffer, length);
156 if (rv == GDI_ERROR && hdc) { 156 if (rv == GDI_ERROR && hdc) {
157 HFONT font = static_cast<HFONT>(GetCurrentObject(hdc, OBJ_FONT)); 157 HFONT font = static_cast<HFONT>(GetCurrentObject(hdc, OBJ_FONT));
158 158
159 LOGFONT logfont; 159 LOGFONT logfont;
(...skipping 351 matching lines...) Expand 10 before | Expand all | Expand 10 after
511 // to free everything possible in just one pass. 511 // to free everything possible in just one pass.
512 while (!v8::V8::IdleNotification()) { 512 while (!v8::V8::IdleNotification()) {
513 } 513 }
514 514
515 #if !defined(OS_MACOSX) && defined(USE_TCMALLOC) 515 #if !defined(OS_MACOSX) && defined(USE_TCMALLOC)
516 // Tell tcmalloc to release any free pages it's still holding. 516 // Tell tcmalloc to release any free pages it's still holding.
517 MallocExtension::instance()->ReleaseFreeMemory(); 517 MallocExtension::instance()->ReleaseFreeMemory();
518 #endif 518 #endif
519 } 519 }
520 520
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