diff options
| author | tommi@chromium.org <tommi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-28 06:58:33 +0000 |
|---|---|---|
| committer | tommi@chromium.org <tommi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-28 06:58:33 +0000 |
| commit | 3e5dd57d47cf3ad1c819401fcc9c751530858a12 (patch) | |
| tree | 3d96efd02984ca5d496f0724908b590e8cfce227 /chrome_frame/chrome_frame_automation.cc | |
| parent | d076fc23882f58997ae657c356b82a83eece4561 (diff) | |
| download | chromium_src-3e5dd57d47cf3ad1c819401fcc9c751530858a12.zip chromium_src-3e5dd57d47cf3ad1c819401fcc9c751530858a12.tar.gz chromium_src-3e5dd57d47cf3ad1c819401fcc9c751530858a12.tar.bz2 | |
Adding policy support to Chrome Frame's launcher so that additional parameters can be passed to Chrome via Group Policy.
BUG=116783
TEST=See information in comment #5 of the issue.
Review URL: https://chromiumcodereview.appspot.com/9836037
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@129384 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame/chrome_frame_automation.cc')
| -rw-r--r-- | chrome_frame/chrome_frame_automation.cc | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/chrome_frame/chrome_frame_automation.cc b/chrome_frame/chrome_frame_automation.cc index b4d3023..88f5f9c 100644 --- a/chrome_frame/chrome_frame_automation.cc +++ b/chrome_frame/chrome_frame_automation.cc @@ -519,7 +519,13 @@ bool ProxyFactory::ReleaseAutomationServer(void* server_id, Vector::ContainerType::iterator it = std::find(proxies_.container().begin(), proxies_.container().end(), entry); - proxies_.container().erase(it); + if (it != proxies_.container().end()) { + proxies_.container().erase(it); + } else { + DLOG(ERROR) << "Proxy wasn't found. Proxy map is likely empty (size=" + << proxies_.container().size() << ")."; + } + lock_.Release(); } |