Move modified ATL sample code to third_party

No code modifications other than removing chromium licence block.
BUG=80617
TEST=none
Review URL: http://codereview.chromium.org/6901059

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@83979 0039d316-1c4b-4281-b951-d872f2087c98

6 files changed, 86 insertions, 19 deletions

diff --git a/chrome_frame/chrome_active_document.h b/chrome_frame/chrome_active_document.h
index a720f23..5440528 100644
--- a/chrome_frame/chrome_active_document.h
+++ b/chrome_frame/chrome_active_document.h
@@ -25,10 +25,10 @@
 #include "chrome_frame/find_dialog.h"
 #include "chrome_frame/html_private_window_impl.h"
 #include "chrome_frame/html_window_impl.h"
-#include "chrome_frame/in_place_menu.h"
-#include "chrome_frame/ole_document_impl.h"
 #include "chrome_frame/resource.h"
 #include "chrome_frame/utils.h"
+#include "third_party/active_doc/in_place_menu.h"
+#include "third_party/active_doc/ole_document_impl.h"
 
 class Thread;
 class TabProxy;
diff --git a/chrome_frame/chrome_frame.gyp b/chrome_frame/chrome_frame.gyp
index b454c51..228e102 100644
--- a/chrome_frame/chrome_frame.gyp
+++ b/chrome_frame/chrome_frame.gyp
@@ -711,6 +711,7 @@
         'exception_barrier.cc',
         'exception_barrier.h',
         'exception_barrier_lowlevel.asm',
+        'extra_system_apis.h',
         'find_dialog.cc',
         'find_dialog.h',
         'function_stub.cc',
@@ -720,7 +721,6 @@
         'http_negotiate.cc',
         'http_negotiate.h',
         'iids.cc',
-        'in_place_menu.h',
         'infobars/infobar_content.h',
         'infobars/internal/displaced_window_manager.cc',
         'infobars/internal/displaced_window_manager.h',
@@ -733,7 +733,6 @@
         'infobars/infobar_manager.cc',
         'metrics_service.cc',
         'metrics_service.h',
-        'ole_document_impl.h',
         'policy_settings.cc',
         'policy_settings.h',
         'protocol_sink_wrap.cc',
@@ -753,7 +752,8 @@
         'register_bho.rgs',
         'stream_impl.cc',
         'stream_impl.h',
-        'extra_system_apis.h',
+        'third_party/active_doc/in_place_menu.h',
+        'third_party/active_doc/ole_document_impl.h',
         'urlmon_bind_status_callback.h',
         'urlmon_bind_status_callback.cc',
         'urlmon_moniker.h',
diff --git a/third_party/active_doc/LICENSE b/third_party/active_doc/LICENSE
new file mode 100644
index 0000000..6dd5228
--- /dev/null
+++ b/third_party/active_doc/LICENSE
@@ -0,0 +1,69 @@
+MICROSOFT LIMITED PUBLIC LICENSE

+

+This license governs use of code marked as “sample” or “example” available on

+this web site without a license agreement, as provided under the section above

+titled “NOTICE SPECIFIC TO SOFTWARE AVAILABLE ON THIS WEB SITE.” If you use

+such code (the “software”), you accept this license. If you do not accept the

+license, do not use the software.

+

+

+1. Definitions

+

+The terms “reproduce,” “reproduction,” “derivative works,” and “distribution”

+have the same meaning here as under U.S. copyright law.

+

+A “contribution” is the original software, or any additions or changes to the

+software.

+

+A “contributor” is any person that distributes its contribution under this

+license.

+

+“Licensed patents” are a contributor’s patent claims that read directly on its

+contribution.

+

+

+2. Grant of Rights

+

+(A) Copyright Grant - Subject to the terms of this license, including the

+license conditions and limitations in section 3, each contributor grants you a

+non-exclusive, worldwide, royalty-free copyright license to reproduce its

+contribution, prepare derivative works of its contribution, and distribute its

+contribution or any derivative works that you create.

+

+(B) Patent Grant - Subject to the terms of this license, including the license

+conditions and limitations in section 3, each contributor grants you a

+non-exclusive, worldwide, royalty-free license under its licensed patents to

+make, have made, use, sell, offer for sale, import, and/or otherwise dispose

+of its contribution in the software or derivative works of the contribution in

+the software.

+

+

+3. Conditions and Limitations

+

+(A) No Trademark License- This license does not grant you rights to use any

+contributors’ name, logo, or trademarks.

+

+(B) If you bring a patent claim against any contributor over patents that you

+claim are infringed by the software, your patent license from such contributor

+to the software ends automatically.

+

+(C) If you distribute any portion of the software, you must retain all

+copyright, patent, trademark, and attribution notices that are present in the

+software.

+

+(D) If you distribute any portion of the software in source code form, you may

+do so only under this license by including a complete copy of this license

+with your distribution. If you distribute any portion of the software in

+compiled or object code form, you may only do so under a license that complies

+with this license.

+

+(E) The software is licensed “as-is.” You bear the risk of using it. The

+contributors give no express warranties, guarantees or conditions. You may

+have additional consumer rights under your local laws which this license

+cannot change. To the extent permitted under your local laws, the contributors

+exclude the implied warranties of merchantability, fitness for a particular

+purpose and non-infringement.

+

+(F) Platform Limitation - The licenses granted in sections 2(A) and 2(B)

+extend only to the software or derivative works that you create that run on a

+Microsoft Windows operating system product.

diff --git a/third_party/active_doc/README.chromium b/third_party/active_doc/README.chromium
new file mode 100644
index 0000000..403242b
--- /dev/null
+++ b/third_party/active_doc/README.chromium
@@ -0,0 +1,9 @@
+Name: MSDN sample code
+Short Name: unknown

+URL: http://msdn.microsoft.com/en-us/library/dssbex6h.aspx
+Version: unknown

+Security Critical: no

+
+Local changes:
+* in_place_menu.h: Modified from Menu.h.
+* ole_document_impl.h: Modified from OleDocument.h
\ No newline at end of file
diff --git a/chrome_frame/in_place_menu.h b/third_party/active_doc/in_place_menu.h
index 76e9d75..4b7be50 100644
--- a/chrome_frame/in_place_menu.h
+++ b/third_party/active_doc/in_place_menu.h
@@ -1,10 +1,3 @@
-// Copyright (c) 2011 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.
-
-#ifndef CHROME_FRAME_IN_PLACE_MENU_H_
-#define CHROME_FRAME_IN_PLACE_MENU_H_
-
 // in_place_menu.h : menu merging implementation
 //
 // This file is a modified version of the menu.h file, which is
@@ -21,6 +14,9 @@
 // See these sources for detailed information regarding the
 // Active Template Library product.
 
+#ifndef CHROME_FRAME_IN_PLACE_MENU_H_
+#define CHROME_FRAME_IN_PLACE_MENU_H_
+
 #include "base/logging.h"
 #include "base/win/scoped_comptr.h"
 
diff --git a/chrome_frame/ole_document_impl.h b/third_party/active_doc/ole_document_impl.h
index f18db16..466c227 100644
--- a/chrome_frame/ole_document_impl.h
+++ b/third_party/active_doc/ole_document_impl.h
@@ -1,10 +1,3 @@
-// Copyright (c) 2010 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.
-
-// TODO(slightlyoff): Add any required LICENSE block changes for MSFT code
-// inclusion.
-
 // ole_document_impl.h : IOleDocument implementation
 //
 // This file is a modified version of the OleDocument.h file, which is