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

Side by Side Diff: chrome/common/chrome_content_client.cc

Issue 7648011: Revert 96592 - Add scroll and gesture message filters for UIPI Flash. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 4 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/common/chrome_content_client.h" 5 #include "chrome/common/chrome_content_client.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/path_service.h" 9 #include "base/path_service.h"
10 #include "base/process_util.h" 10 #include "base/process_util.h"
(...skipping 344 matching lines...) Expand 10 before | Expand all | Expand 10 after
355 if (result != sandbox::SBOX_ALL_OK) { 355 if (result != sandbox::SBOX_ALL_OK) {
356 NOTREACHED(); 356 NOTREACHED();
357 return false; 357 return false;
358 } 358 }
359 359
360 // Spawn the flash broker and apply sandbox policy. 360 // Spawn the flash broker and apply sandbox policy.
361 if (LoadFlashBroker(plugin_path, command_line)) { 361 if (LoadFlashBroker(plugin_path, command_line)) {
362 policy->SetJobLevel(sandbox::JOB_UNPROTECTED, 0); 362 policy->SetJobLevel(sandbox::JOB_UNPROTECTED, 0);
363 policy->SetTokenLevel(sandbox::USER_RESTRICTED_SAME_ACCESS, 363 policy->SetTokenLevel(sandbox::USER_RESTRICTED_SAME_ACCESS,
364 sandbox::USER_INTERACTIVE); 364 sandbox::USER_INTERACTIVE);
365 // Allow the Flash plugin to forward some messages back to Chrome.
366 if (base::win::GetVersion() == base::win::VERSION_VISTA) {
367 typedef BOOL (WINAPI *ChangeWindowMessageFilterFunction)(
368 UINT message,
369 DWORD flag);
370 static ChangeWindowMessageFilterFunction s_ChangeWindowMessageFilter =
371 reinterpret_cast<ChangeWindowMessageFilterFunction>(
372 ::GetProcAddress(::GetModuleHandle(L"user32.dll"),
373 "ChangeWindowMessageFilter"));
374 // Per-window message filters required on Win7 or later must be added to:
375 // render_widget_host_view_win.cc RenderWidgetHostViewWin::ReparentWindow
376 s_ChangeWindowMessageFilter(WM_MOUSEWHEEL, MSGFLT_ADD);
377 }
378 policy->SetIntegrityLevel(sandbox::INTEGRITY_LEVEL_LOW); 365 policy->SetIntegrityLevel(sandbox::INTEGRITY_LEVEL_LOW);
379 } else { 366 } else {
380 // Could not start the broker, use a very weak policy instead. 367 // Could not start the broker, use a very weak policy instead.
381 DLOG(WARNING) << "Failed to start flash broker"; 368 DLOG(WARNING) << "Failed to start flash broker";
382 policy->SetJobLevel(sandbox::JOB_UNPROTECTED, 0); 369 policy->SetJobLevel(sandbox::JOB_UNPROTECTED, 0);
383 policy->SetTokenLevel( 370 policy->SetTokenLevel(
384 sandbox::USER_UNPROTECTED, sandbox::USER_UNPROTECTED); 371 sandbox::USER_UNPROTECTED, sandbox::USER_UNPROTECTED);
385 } 372 }
386 373
387 return true; 374 return true;
388 } 375 }
389 #endif 376 #endif
390 377
391 } // namespace chrome 378 } // namespace chrome
OLDNEW
« no previous file with comments | « chrome/browser/renderer_host/render_widget_host_view_win.cc ('k') | content/browser/plugin_process_host.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698