diff options
author | joi@chromium.org <joi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-21 19:40:21 +0000 |
---|---|---|
committer | joi@chromium.org <joi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-21 19:40:21 +0000 |
commit | a55c1d6e5a42bbf334c61dbc2bacab4683770f49 (patch) | |
tree | 9272ab3448e51c22598518b76b36cc1b242c4f29 /ceee | |
parent | 146185df383870a8b4dba30061aa6a1118c58239 (diff) | |
download | chromium_src-a55c1d6e5a42bbf334c61dbc2bacab4683770f49.zip chromium_src-a55c1d6e5a42bbf334c61dbc2bacab4683770f49.tar.gz chromium_src-a55c1d6e5a42bbf334c61dbc2bacab4683770f49.tar.bz2 |
Always use flag needed by CEEE. Now that we use the same profile for
CF and CEEE, we need to ensure they both start Chrome with the same
flags.
Since IChromeFramePrivileged is a private/unfrozen interface, I simply
removed the GetChromeExtraArguments method as we are no longer using it.
BUG=63427
TEST=none
Review URL: http://codereview.chromium.org/5109006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@66916 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ceee')
-rw-r--r-- | ceee/ie/common/chrome_frame_host.cc | 11 | ||||
-rw-r--r-- | ceee/ie/common/chrome_frame_host.h | 1 | ||||
-rw-r--r-- | ceee/ie/plugin/bho/infobar_browser_window.cc | 13 | ||||
-rw-r--r-- | ceee/ie/plugin/bho/infobar_browser_window.h | 1 | ||||
-rw-r--r-- | ceee/ie/plugin/toolband/tool_band.cc | 11 | ||||
-rw-r--r-- | ceee/ie/plugin/toolband/tool_band.h | 1 |
6 files changed, 0 insertions, 38 deletions
diff --git a/ceee/ie/common/chrome_frame_host.cc b/ceee/ie/common/chrome_frame_host.cc index 66e8efc..dc5362a 100644 --- a/ceee/ie/common/chrome_frame_host.cc +++ b/ceee/ie/common/chrome_frame_host.cc @@ -61,17 +61,6 @@ STDMETHODIMP ChromeFrameHost::GetWantsPrivileged(boolean* wants_privileged) { return S_OK; } -STDMETHODIMP ChromeFrameHost::GetChromeExtraArguments(BSTR* args) { - DCHECK(args); - - // Extra arguments are passed on verbatim, so we add the -- prefix. - CComBSTR str = "--"; - str.Append(switches::kEnableExperimentalExtensionApis); - - *args = str.Detach(); - return S_OK; -} - STDMETHODIMP ChromeFrameHost::GetChromeProfileName(BSTR* profile_name) { return chrome_profile_name_.CopyTo(profile_name); } diff --git a/ceee/ie/common/chrome_frame_host.h b/ceee/ie/common/chrome_frame_host.h index b04b7b5..4703e71 100644 --- a/ceee/ie/common/chrome_frame_host.h +++ b/ceee/ie/common/chrome_frame_host.h @@ -140,7 +140,6 @@ class ATL_NO_VTABLE ChromeFrameHost // @name IChromeFramePrivileged implementation. // @{ STDMETHOD(GetWantsPrivileged)(boolean* wants_privileged); - STDMETHOD(GetChromeExtraArguments)(BSTR* args); STDMETHOD(GetChromeProfileName)(BSTR* args); STDMETHOD(GetExtensionApisToAutomate)(BSTR* functions_enabled); STDMETHOD(ShouldShowVersionMismatchDialog)(); diff --git a/ceee/ie/plugin/bho/infobar_browser_window.cc b/ceee/ie/plugin/bho/infobar_browser_window.cc index 8a332e4..c5de414 100644 --- a/ceee/ie/plugin/bho/infobar_browser_window.cc +++ b/ceee/ie/plugin/bho/infobar_browser_window.cc @@ -39,19 +39,6 @@ STDMETHODIMP InfobarBrowserWindow::GetWantsPrivileged( return S_OK; } -STDMETHODIMP InfobarBrowserWindow::GetChromeExtraArguments(BSTR* args) { - DCHECK(args); - - // Must enable experimental extensions because we want to load html pages - // from our extension. - // Extra arguments are passed on verbatim, so we add the -- prefix. - CComBSTR str = "--"; - str.Append(switches::kEnableExperimentalExtensionApis); - - *args = str.Detach(); - return S_OK; -} - STDMETHODIMP InfobarBrowserWindow::GetChromeProfileName(BSTR* profile_name) { *profile_name = ::SysAllocString( ceee_module_util::GetBrokerProfileNameForIe()); diff --git a/ceee/ie/plugin/bho/infobar_browser_window.h b/ceee/ie/plugin/bho/infobar_browser_window.h index 9c4b39f..fa4d8a7 100644 --- a/ceee/ie/plugin/bho/infobar_browser_window.h +++ b/ceee/ie/plugin/bho/infobar_browser_window.h @@ -102,7 +102,6 @@ class ATL_NO_VTABLE InfobarBrowserWindow // @name IChromeFramePrivileged implementation. // @{ STDMETHOD(GetWantsPrivileged)(boolean *wants_privileged); - STDMETHOD(GetChromeExtraArguments)(BSTR *args); STDMETHOD(GetChromeProfileName)(BSTR *args); STDMETHOD(GetExtensionApisToAutomate)(BSTR *args); STDMETHOD(ShouldShowVersionMismatchDialog)(); diff --git a/ceee/ie/plugin/toolband/tool_band.cc b/ceee/ie/plugin/toolband/tool_band.cc index 89e8be1..d30c9a2 100644 --- a/ceee/ie/plugin/toolband/tool_band.cc +++ b/ceee/ie/plugin/toolband/tool_band.cc @@ -213,17 +213,6 @@ STDMETHODIMP ToolBand::GetWantsPrivileged(boolean* wants_privileged) { return S_OK; } -STDMETHODIMP ToolBand::GetChromeExtraArguments(BSTR* args) { - DCHECK(args); - - // Extra arguments are passed on verbatim, so we add the -- prefix. - CComBSTR str = "--"; - str.Append(switches::kEnableExperimentalExtensionApis); - - *args = str.Detach(); - return S_OK; -} - STDMETHODIMP ToolBand::GetChromeProfileName(BSTR* profile_name) { *profile_name = ::SysAllocString( ceee_module_util::GetBrokerProfileNameForIe()); diff --git a/ceee/ie/plugin/toolband/tool_band.h b/ceee/ie/plugin/toolband/tool_band.h index 1fbe73f..08ae691 100644 --- a/ceee/ie/plugin/toolband/tool_band.h +++ b/ceee/ie/plugin/toolband/tool_band.h @@ -137,7 +137,6 @@ class ATL_NO_VTABLE ToolBand : public CComObjectRootEx<CComSingleThreadModel>, // @name IChromeFramePrivileged implementation. // @{ STDMETHOD(GetWantsPrivileged)(boolean *wants_privileged); - STDMETHOD(GetChromeExtraArguments)(BSTR *args); STDMETHOD(GetChromeProfileName)(BSTR *args); STDMETHOD(GetExtensionApisToAutomate)(BSTR *args); STDMETHOD(ShouldShowVersionMismatchDialog)(); |