projects
/
platform
/
framework
/
web
/
crosswalk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Upstream version 7.36.149.0
[platform/framework/web/crosswalk.git]
/
src
/
chrome
/
browser
/
plugins
/
plugin_installer.h
diff --git
a/src/chrome/browser/plugins/plugin_installer.h
b/src/chrome/browser/plugins/plugin_installer.h
index
6cd8659
..
81d3447
100644
(file)
--- a/
src/chrome/browser/plugins/plugin_installer.h
+++ b/
src/chrome/browser/plugins/plugin_installer.h
@@
-5,6
+5,7
@@
#ifndef CHROME_BROWSER_PLUGINS_PLUGIN_INSTALLER_H_
#define CHROME_BROWSER_PLUGINS_PLUGIN_INSTALLER_H_
#ifndef CHROME_BROWSER_PLUGINS_PLUGIN_INSTALLER_H_
#define CHROME_BROWSER_PLUGINS_PLUGIN_INSTALLER_H_
+#include "base/gtest_prod_util.h"
#include "base/observer_list.h"
#include "base/strings/string16.h"
#include "base/version.h"
#include "base/observer_list.h"
#include "base/strings/string16.h"
#include "base/version.h"
@@
-17,6
+18,7
@@
class PluginInstallerObserver;
class WeakPluginInstallerObserver;
namespace content {
class WeakPluginInstallerObserver;
namespace content {
+class DownloadManager;
class WebContents;
struct WebPluginInfo;
}
class WebContents;
struct WebPluginInfo;
}
@@
-52,6
+54,10
@@
class PluginInstaller : public content::DownloadItem::Observer {
content::WebContents* web_contents);
private:
content::WebContents* web_contents);
private:
+ void StartInstallingWithDownloadManager(
+ const GURL& plugin_url,
+ content::WebContents* web_contents,
+ content::DownloadManager* download_manager);
void DownloadStarted(content::DownloadItem* item,
content::DownloadInterruptReason interrupt_reason);
void DownloadError(const std::string& msg);
void DownloadStarted(content::DownloadItem* item,
content::DownloadInterruptReason interrupt_reason);
void DownloadError(const std::string& msg);
@@
-62,6
+68,10
@@
class PluginInstaller : public content::DownloadItem::Observer {
int strong_observer_count_;
ObserverList<WeakPluginInstallerObserver> weak_observers_;
int strong_observer_count_;
ObserverList<WeakPluginInstallerObserver> weak_observers_;
+ FRIEND_TEST_ALL_PREFIXES(PluginInstallerTest,
+ StartInstalling_SuccessfulDownload);
+ FRIEND_TEST_ALL_PREFIXES(PluginInstallerTest, StartInstalling_FailedStart);
+ FRIEND_TEST_ALL_PREFIXES(PluginInstallerTest, StartInstalling_Interrupted);
DISALLOW_COPY_AND_ASSIGN(PluginInstaller);
};
DISALLOW_COPY_AND_ASSIGN(PluginInstaller);
};