diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-12 20:53:23 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-12 20:53:23 +0000 |
| commit | 8ee65baac4ab9e3beb67674adbc6a210e2708604 (patch) | |
| tree | 44400d118d7813a8d7e16a67f074c6696f8868b3 /chrome_frame/chrome_active_document.h | |
| parent | f1094b0275c82ead4b9aabbda24f5c2b3e8b4a1b (diff) | |
| download | chromium_src-8ee65baac4ab9e3beb67674adbc6a210e2708604.zip chromium_src-8ee65baac4ab9e3beb67674adbc6a210e2708604.tar.gz chromium_src-8ee65baac4ab9e3beb67674adbc6a210e2708604.tar.bz2 | |
Include base/win/scoped_comptr.h instead of base/scoped_comptr_win.h.
Fix up all the callers to use the new location and namespace.
Also, delete the stub file since it isn't included by anyone more.
(Note: This was a TODO for brettw).
BUG=None
TEST=None
R=brettw@chromium.org
Review URL: http://codereview.chromium.org/6825055
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@81303 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame/chrome_active_document.h')
| -rw-r--r-- | chrome_frame/chrome_active_document.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome_frame/chrome_active_document.h b/chrome_frame/chrome_active_document.h index d9e4f73..a720f23 100644 --- a/chrome_frame/chrome_active_document.h +++ b/chrome_frame/chrome_active_document.h @@ -16,18 +16,18 @@ #include <string> #include "base/memory/scoped_ptr.h" -#include "base/scoped_comptr_win.h" #include "base/threading/thread.h" +#include "base/win/scoped_comptr.h" #include "chrome_frame/chrome_frame_activex_base.h" #include "chrome_frame/com_type_info_holder.h" +#include "chrome_frame/extra_system_apis.h" #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/extra_system_apis.h" #include "chrome_frame/utils.h" class Thread; @@ -467,7 +467,7 @@ END_EXEC_COMMAND_MAP() // a new ChromeActiveDocument instance is taking its place. bool is_automation_client_reused_; - ScopedComPtr<INewWindowManager> popup_manager_; + base::win::ScopedComPtr<INewWindowManager> popup_manager_; bool popup_allowed_; HACCEL accelerator_table_; |