summaryrefslogtreecommitdiffstats
path: root/chrome/default_plugin
diff options
context:
space:
mode:
authorpkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-20 20:22:25 +0000
committerpkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-20 20:22:25 +0000
commite987ee972f4fc9af948f72dbe21d34be6df8af5e (patch)
tree906daad590c806147f644d4745b51c6a9fa6abf1 /chrome/default_plugin
parent3d3d5ceb58d2a71402fc346ba26c6bd4231d5116 (diff)
downloadchromium_src-e987ee972f4fc9af948f72dbe21d34be6df8af5e.zip
chromium_src-e987ee972f4fc9af948f72dbe21d34be6df8af5e.tar.gz
chromium_src-e987ee972f4fc9af948f72dbe21d34be6df8af5e.tar.bz2
Convert LOG(INFO) to VLOG(1) - chrome/default_plugin/.
BUG=none TEST=none Review URL: http://codereview.chromium.org/3917002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@63255 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/default_plugin')
-rw-r--r--chrome/default_plugin/plugin_database_handler.cc21
-rw-r--r--chrome/default_plugin/plugin_impl_gtk.cc2
-rw-r--r--chrome/default_plugin/plugin_impl_mac.mm2
-rw-r--r--chrome/default_plugin/plugin_impl_win.cc14
-rw-r--r--chrome/default_plugin/plugin_install_job_monitor.cc4
5 files changed, 20 insertions, 23 deletions
diff --git a/chrome/default_plugin/plugin_database_handler.cc b/chrome/default_plugin/plugin_database_handler.cc
index aadcabc..8abd342 100644
--- a/chrome/default_plugin/plugin_database_handler.cc
+++ b/chrome/default_plugin/plugin_database_handler.cc
@@ -73,8 +73,8 @@ bool PluginDatabaseHandler::DownloadPluginsFileIfNeeded(
}
if (initiate_download) {
- DLOG(INFO) << "Initiating GetURLNotify on the plugin finder URL "
- << plugin_finder_url.c_str();
+ DVLOG(1) << "Initiating GetURLNotify on the plugin finder URL "
+ << plugin_finder_url.c_str();
plugin_installer_instance_.set_plugin_installer_state(
PluginListDownloadInitiated);
@@ -84,15 +84,13 @@ bool PluginDatabaseHandler::DownloadPluginsFileIfNeeded(
plugin_installer_instance_.instance(), plugin_finder_url.c_str(),
NULL, NULL);
} else {
- DLOG(INFO) << "Plugins file " << plugins_file_.c_str()
- << " already exists";
+ DVLOG(1) << "Plugins file " << plugins_file_ << " already exists";
plugin_downloads_file_ = ::CreateFile(plugins_file_.c_str(), GENERIC_READ,
FILE_SHARE_READ, NULL, OPEN_EXISTING,
FILE_ATTRIBUTE_NORMAL, NULL);
if (plugin_downloads_file_ == INVALID_HANDLE_VALUE) {
- DLOG(INFO) << "Failed to open plugins file "
- << plugins_file_.c_str() << " Error "
- << ::GetLastError();
+ DVLOG(1) << "Failed to open plugins file " << plugins_file_
+ << " Error " << ::GetLastError();
NOTREACHED();
return false;
}
@@ -113,7 +111,7 @@ int32 PluginDatabaseHandler::Write(NPStream* stream, int32 offset,
}
if (plugin_downloads_file_ == INVALID_HANDLE_VALUE) {
- DLOG(INFO) << "About to create plugins file " << plugins_file_.c_str();
+ DVLOG(1) << "About to create plugins file " << plugins_file_;
plugin_downloads_file_ = CreateFile(plugins_file_.c_str(),
GENERIC_READ | GENERIC_WRITE,
FILE_SHARE_READ, NULL, CREATE_ALWAYS,
@@ -133,9 +131,8 @@ int32 PluginDatabaseHandler::Write(NPStream* stream, int32 offset,
}
}
- DLOG(INFO) << "Failed to create plugins file "
- << plugins_file_.c_str() << " Error "
- << ::GetLastError();
+ DVLOG(1) << "Failed to create plugins file " << plugins_file_
+ << " Error " << ::GetLastError();
NOTREACHED();
return 0;
}
@@ -212,7 +209,7 @@ bool PluginDatabaseHandler::ParsePluginList() {
xmlXPathFreeObject(plugins_result);
xmlFreeDoc(plugin_downloads_doc);
xmlCleanupParser();
- DLOG(INFO) << "Parse plugins file result " << parse_result;
+ DVLOG(1) << "Parse plugins file result " << parse_result;
return parse_result;
}
diff --git a/chrome/default_plugin/plugin_impl_gtk.cc b/chrome/default_plugin/plugin_impl_gtk.cc
index 19b960e..7179858 100644
--- a/chrome/default_plugin/plugin_impl_gtk.cc
+++ b/chrome/default_plugin/plugin_impl_gtk.cc
@@ -31,7 +31,7 @@ PluginInstallerImpl::~PluginInstallerImpl() {
bool PluginInstallerImpl::Initialize(void* module_handle, NPP instance,
NPMIMEType mime_type, int16 argc,
char* argn[], char* argv[]) {
- DLOG(INFO) << __FUNCTION__ << " MIME Type : " << mime_type;
+ DVLOG(1) << __FUNCTION__ << " MIME Type : " << mime_type;
DCHECK(instance != NULL);
if (mime_type == NULL || strlen(mime_type) == 0) {
diff --git a/chrome/default_plugin/plugin_impl_mac.mm b/chrome/default_plugin/plugin_impl_mac.mm
index 9c8bff4..c7ca755 100644
--- a/chrome/default_plugin/plugin_impl_mac.mm
+++ b/chrome/default_plugin/plugin_impl_mac.mm
@@ -35,7 +35,7 @@ PluginInstallerImpl::~PluginInstallerImpl() {
bool PluginInstallerImpl::Initialize(void* module_handle, NPP instance,
NPMIMEType mime_type, int16 argc,
char* argn[], char* argv[]) {
- DLOG(INFO) << __FUNCTION__ << " MIME Type : " << mime_type;
+ DVLOG(1) << __FUNCTION__ << " MIME Type : " << mime_type;
DCHECK(instance != NULL);
if (mime_type == NULL || strlen(mime_type) == 0) {
diff --git a/chrome/default_plugin/plugin_impl_win.cc b/chrome/default_plugin/plugin_impl_win.cc
index 4d0f7f0f..e9346c6 100644
--- a/chrome/default_plugin/plugin_impl_win.cc
+++ b/chrome/default_plugin/plugin_impl_win.cc
@@ -53,7 +53,7 @@ PluginInstallerImpl::~PluginInstallerImpl() {
bool PluginInstallerImpl::Initialize(HINSTANCE module_handle, NPP instance,
NPMIMEType mime_type, int16 argc,
char* argn[], char* argv[]) {
- DLOG(INFO) << __FUNCTION__ << " MIME Type : " << mime_type;
+ DVLOG(1) << __FUNCTION__ << " MIME Type : " << mime_type;
DCHECK(instance != NULL);
DCHECK(module_handle != NULL);
@@ -226,7 +226,7 @@ void PluginInstallerImpl::URLNotify(const char* url, NPReason reason) {
if (plugin_installer_state_ == PluginListDownloadInitiated) {
bool plugin_available = false;
if (reason == NPRES_DONE) {
- DLOG(INFO) << "Received Done notification for plugin list download";
+ DVLOG(1) << "Received Done notification for plugin list download";
plugin_database_handler_.ParsePluginList();
if (plugin_database_handler_.GetPluginDetailsForMimeType(
mime_type_.c_str(), desired_language_.c_str(),
@@ -248,7 +248,7 @@ void PluginInstallerImpl::URLNotify(const char* url, NPReason reason) {
}
if (plugin_available) {
- DLOG(INFO) << "Plugin available for mime type " << mime_type_;
+ DVLOG(1) << "Plugin available for mime type " << mime_type_;
DisplayAvailablePluginStatus();
NotifyPluginStatus(default_plugin::MISSING_PLUGIN_AVAILABLE);
} else {
@@ -327,8 +327,8 @@ bool PluginInstallerImpl::NPP_SetWindow(NPWindow* window_info) {
void PluginInstallerImpl::DownloadPlugin() {
set_plugin_installer_state(PluginDownloadInitiated);
- DLOG(INFO) << "Initiating download for plugin URL "
- << plugin_download_url_.c_str();
+ DVLOG(1) << "Initiating download for plugin URL "
+ << plugin_download_url_.c_str();
DisplayStatus(IDS_DEFAULT_PLUGIN_DOWNLOADING_PLUGIN_MSG);
@@ -578,7 +578,7 @@ LRESULT PluginInstallerImpl::OnCopyData(UINT message, WPARAM wparam,
set_plugin_installer_state(PluginDownloadFailed);
DisplayPluginDownloadFailedStatus();
} else {
- DLOG(INFO) << "Successfully downloaded plugin installer";
+ DVLOG(1) << "Successfully downloaded plugin installer";
set_plugin_installer_state(PluginDownloadCompleted);
std::wstring file_path =
@@ -601,7 +601,7 @@ LRESULT PluginInstallerImpl::OnCopyData(UINT message, WPARAM wparam,
DisplayStatus(IDS_DEFAULT_PLUGIN_INSTALLATION_FAILED_MSG);
NOTREACHED();
} else {
- DLOG(INFO) << "Successfully launched plugin installer";
+ DVLOG(1) << "Successfully launched plugin installer";
set_plugin_installer_state(PluginInstallerLaunchSuccess);
installation_job_monitor_thread_->AssignProcessToJob(
shell_execute_info.hProcess);
diff --git a/chrome/default_plugin/plugin_install_job_monitor.cc b/chrome/default_plugin/plugin_install_job_monitor.cc
index d0088eb..4e19057 100644
--- a/chrome/default_plugin/plugin_install_job_monitor.cc
+++ b/chrome/default_plugin/plugin_install_job_monitor.cc
@@ -79,8 +79,8 @@ void PluginInstallationJobMonitorThread::WaitForJobThread() {
install_job_completion_port_, &job_event,
&completion_key, &overlapped, INFINITE)) {
if (job_event == JOB_OBJECT_MSG_ACTIVE_PROCESS_ZERO) {
- DLOG(INFO) << "All processes in the installer job have exited.";
- DLOG(INFO) << "Initiating refresh on the plugins list";
+ DVLOG(1) << "All processes in the installer job have exited. "
+ "Initiating refresh on the plugins list";
DCHECK(::IsWindow(plugin_window_));
PostMessageW(plugin_window_,
PluginInstallerImpl::kRefreshPluginsMessage, 0, 0);