chrome_frame/chrome_frame_automation.h - Issue 6825055: Include base/win/scoped_comptr.h instead of base/scoped_comptr_win.h.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome_frame/chrome_frame_automation.h

Issue 6825055: Include base/win/scoped_comptr.h instead of base/scoped_comptr_win.h. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: revert bad indentation, rebase Created 9 years, 8 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:

Index: chrome_frame/chrome_frame_automation.h

diff --git a/chrome_frame/chrome_frame_automation.h b/chrome_frame/chrome_frame_automation.h

index 18494c3e08ef47767333616ba67a1b33c49d38d2..eed298317397647ee73dea28d0e3bb9bfa502fd7 100644

--- a/chrome_frame/chrome_frame_automation.h

+++ b/chrome_frame/chrome_frame_automation.h

@@ -7,8 +7,8 @@

#include <atlbase.h>

#include <atlwin.h>

-#include <string>

#include <map>

+#include <string>

#include <vector>

#include "base/memory/ref_counted.h"

@@ -528,7 +528,7 @@ class ChromeFrameAutomationClient

scoped_refptr<ChromeFrameLaunchParams> chrome_launch_params_;

// Cache security manager for URL zone checking

- ScopedComPtr<IInternetSecurityManager> security_manager_;

+ base::win::ScopedComPtr<IInternetSecurityManager> security_manager_;

// When host network stack is used, this object is in charge of

// handling network requests.

« no previous file with comments | « chrome_frame/chrome_frame_activex.cc ('k') | chrome_frame/com_message_event.h » ('j') | no next file with comments »