Commit ebcb3137 authored by Avi Drissman's avatar Avi Drissman Committed by Commit Bot

Remove linked_ptr from chrome/browser/ui/.

BUG=556939

Change-Id: I0bb5e64f47203e3f71f0bf8eef8eaa6c449ad7b0
Reviewed-on: https://chromium-review.googlesource.com/c/1357552
Commit-Queue: Sidney San Martín <sdy@chromium.org>
Reviewed-by: default avatarSidney San Martín <sdy@chromium.org>
Cr-Commit-Position: refs/heads/master@{#613111}
parent 33a4e43a
......@@ -156,9 +156,9 @@ void HungPluginTabHelper::PluginHungStatusChanged(
content::PluginService::GetInstance()->GetPluginDisplayNameByPath(
plugin_path);
linked_ptr<PluginState> state(new PluginState(plugin_path, plugin_name));
hung_plugins_[plugin_child_id] = state;
ShowBar(plugin_child_id, state.get());
hung_plugins_[plugin_child_id] =
std::make_unique<PluginState>(plugin_path, plugin_name);
ShowBar(plugin_child_id, hung_plugins_[plugin_child_id].get());
}
void HungPluginTabHelper::OnInfoBarRemoved(infobars::InfoBar* infobar,
......
......@@ -6,9 +6,9 @@
#define CHROME_BROWSER_UI_HUNG_PLUGIN_TAB_HELPER_H_
#include <map>
#include <memory>
#include "base/macros.h"
#include "base/memory/linked_ptr.h"
#include "base/scoped_observer.h"
#include "base/strings/string16.h"
#include "base/time/time.h"
......@@ -58,7 +58,6 @@ class HungPluginTabHelper
friend class content::WebContentsUserData<HungPluginTabHelper>;
struct PluginState;
typedef std::map<int, linked_ptr<PluginState> > PluginStateMap;
explicit HungPluginTabHelper(content::WebContents* contents);
......@@ -74,7 +73,7 @@ class HungPluginTabHelper
void CloseBar(PluginState* state);
// All currently hung plugins.
PluginStateMap hung_plugins_;
std::map<int, std::unique_ptr<PluginState>> hung_plugins_;
ScopedObserver<infobars::InfoBarManager, infobars::InfoBarManager::Observer>
infobar_observer_;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment