Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Unified Diff: src/plugin/PluginClass.cpp

Issue 10825021: Move settings page into the application directory (Closed)
Patch Set: Created June 3, 2013, 11:40 a.m.
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: src/plugin/PluginClass.cpp
===================================================================
--- a/src/plugin/PluginClass.cpp
+++ b/src/plugin/PluginClass.cpp
@@ -1406,17 +1406,17 @@ void CPluginClass::DisplayPluginMenu(HME
#ifdef SUPPORT_WHITELIST
client->ClearWhiteListCache();
#endif
}
break;
#ifndef ENTERPRISE
case ID_SETTINGS:
{
- url = UserSettingsFileUrl();
+ url = CString(UserSettingsFileUrl().c_str());
}
break;
#endif
case ID_INVITEFRIENDS:
{
url = CPluginHttpRequest::GetStandardUrl(USERS_SCRIPT_INVITATION);
navigationErrorId = PLUGIN_ERROR_NAVIGATION_INVITATION;
}
@@ -1955,22 +1955,22 @@ LRESULT CALLBACK CPluginClass::PaneWindo
#else
CComQIPtr<IWebBrowser2> browser = GetAsyncBrowser();
if (browser)
{
VARIANT vFlags;
vFlags.vt = VT_I4;
vFlags.intVal = navOpenInNewTab;
- HRESULT hr = browser->Navigate(CComBSTR(UserSettingsFileUrl()), &vFlags, NULL, NULL, NULL);
+ HRESULT hr = browser->Navigate(BString(UserSettingsFileUrl()), &vFlags, NULL, NULL, NULL);
if (FAILED(hr))
{
vFlags.intVal = navOpenInNewWindow;
- hr = browser->Navigate(CComBSTR(UserSettingsFileUrl()), &vFlags, NULL, NULL, NULL);
+ hr = browser->Navigate(BString(UserSettingsFileUrl()), &vFlags, NULL, NULL, NULL);
if (FAILED(hr))
{
DEBUG_ERROR_LOG(hr, PLUGIN_ERROR_NAVIGATION, PLUGIN_ERROR_NAVIGATION_SETTINGS, "Navigation::Failed")
}
}
}
#endif
}

Powered by Google App Engine
This is Rietveld