Merge 21437 - CPAPI (0.11) for gears drag drop....

chrome/browser/child_process_security_policy.cc

Index: chrome/browser/child_process_security_policy.cc
===================================================================
--- chrome/browser/child_process_security_policy.cc	(revision 21731)
+++ chrome/browser/child_process_security_policy.cc	(working copy)
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+// Copyright (c) 2009 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -292,7 +292,7 @@
 }
 
 bool ChildProcessSecurityPolicy::CanUploadFile(int renderer_id,
-                                           const FilePath& file) {
+                                               const FilePath& file) {
   AutoLock lock(lock_);
 
   SecurityStateMap::iterator state = security_state_.find(renderer_id);
Property changes on: chrome\browser\child_process_security_policy.cc
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk/src/chrome/browser/child_process_security_policy.cc:r21437