summaryrefslogtreecommitdiffstats
path: root/chrome/browser
diff options
context:
space:
mode:
authorpkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-21 20:57:12 +0000
committerpkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-21 20:57:12 +0000
commit8e96e50baaa3cf984eb64355391d7ec48a958e81 (patch)
treeaf80bc851bc4421a5e159c3bd1bc1cb31ee21f55 /chrome/browser
parent6662050331dad5db984ac85e8705ff49236dbe51 (diff)
downloadchromium_src-8e96e50baaa3cf984eb64355391d7ec48a958e81.zip
chromium_src-8e96e50baaa3cf984eb64355391d7ec48a958e81.tar.gz
chromium_src-8e96e50baaa3cf984eb64355391d7ec48a958e81.tar.bz2
Convert LOG(INFO) to VLOG(1) - misc. chrome/browser/*.
BUG=none TEST=none Review URL: http://codereview.chromium.org/4008001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@63421 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
-rw-r--r--chrome/browser/aeropeek_manager.cc36
-rw-r--r--chrome/browser/background_contents_service.cc6
-rw-r--r--chrome/browser/blocked_content_container.cc4
-rw-r--r--chrome/browser/browser_about_handler.cc2
-rw-r--r--chrome/browser/browser_main.cc2
-rw-r--r--chrome/browser/browser_main_posix.cc2
-rw-r--r--chrome/browser/browser_main_win.cc8
-rw-r--r--chrome/browser/bug_report_util.cc12
-rw-r--r--chrome/browser/external_tab_container_win.cc2
-rw-r--r--chrome/browser/io_thread.cc2
-rw-r--r--chrome/browser/options_util.cc4
-rw-r--r--chrome/browser/plugin_process_host.cc2
-rw-r--r--chrome/browser/process_singleton_win.cc2
-rw-r--r--chrome/browser/profile_impl.cc14
-rw-r--r--chrome/browser/profile_manager_unittest.cc4
-rw-r--r--chrome/browser/shell_integration_linux.cc4
-rw-r--r--chrome/browser/shell_integration_win.cc2
-rw-r--r--chrome/browser/zygote_main_linux.cc2
18 files changed, 43 insertions, 67 deletions
diff --git a/chrome/browser/aeropeek_manager.cc b/chrome/browser/aeropeek_manager.cc
index e10c3a1..d1837d7 100644
--- a/chrome/browser/aeropeek_manager.cc
+++ b/chrome/browser/aeropeek_manager.cc
@@ -261,36 +261,14 @@ class RegisterThumbnailTask : public Task {
// message.
// TODO(hbono): we need to check this registered message?
ScopedComPtr<ITaskbarList3> taskbar;
- HRESULT result = taskbar.CreateInstance(CLSID_TaskbarList, NULL,
- CLSCTX_INPROC_SERVER);
- if (FAILED(result)) {
- LOG(INFO) << "failed creating a TaskbarList object: " << result;
+ if (FAILED(taskbar.CreateInstance(CLSID_TaskbarList, NULL,
+ CLSCTX_INPROC_SERVER)) ||
+ FAILED(taskbar->HrInit()) ||
+ FAILED(taskbar->RegisterTab(window_, frame_window_)) ||
+ FAILED(taskbar->SetTabOrder(window_, NULL)))
return;
- }
-
- result = taskbar->HrInit();
- if (FAILED(result)) {
- LOG(INFO) << "failed initializing a TaskbarList obejct: " << result;
- return;
- }
-
- result = taskbar->RegisterTab(window_, frame_window_);
- if (FAILED(result)) {
- LOG(INFO) << "failed registering a thumbnail window: " << result;
- return;
- }
-
- result = taskbar->SetTabOrder(window_, NULL);
- if (FAILED(result)) {
- LOG(INFO) << "failed adding a thumbnail window: " << result;
- return;
- }
-
- if (active_) {
- result = taskbar->SetTabActive(window_, frame_window_, 0);
- if (FAILED(result))
- LOG(INFO) << "failed activating a thumbnail window: " << result;
- }
+ if (active_)
+ taskbar->SetTabActive(window_, frame_window_, 0);
}
private:
diff --git a/chrome/browser/background_contents_service.cc b/chrome/browser/background_contents_service.cc
index e50572c..1c9b71e 100644
--- a/chrome/browser/background_contents_service.cc
+++ b/chrome/browser/background_contents_service.cc
@@ -153,7 +153,7 @@ void BackgroundContentsService::CreateBackgroundContents(
DCHECK(!GetAppBackgroundContents(application_id));
DCHECK(!application_id.empty());
DCHECK(url.is_valid());
- DLOG(INFO) << "Loading background content url: " << url;
+ DVLOG(1) << "Loading background content url: " << url;
// Check to make sure that the parent extension is still enabled.
ExtensionsService* extensions_service = profile->GetExtensionsService();
@@ -165,8 +165,8 @@ void BackgroundContentsService::CreateBackgroundContents(
// to become uninstalled without the associated BackgroundContents being
// unregistered via the EXTENSIONS_UNLOADED notification, unless there's a
// crash before we could save our prefs.
- NOTREACHED() << "No extension found for BackgroundContents - id = " <<
- application_id;
+ NOTREACHED() << "No extension found for BackgroundContents - id = "
+ << application_id;
return;
}
diff --git a/chrome/browser/blocked_content_container.cc b/chrome/browser/blocked_content_container.cc
index 640e505..37767ca 100644
--- a/chrome/browser/blocked_content_container.cc
+++ b/chrome/browser/blocked_content_container.cc
@@ -39,8 +39,8 @@ void BlockedContentContainer::AddTabContents(TabContents* tab_contents,
bool user_gesture) {
if (blocked_contents_.size() == (kImpossibleNumberOfPopups - 1)) {
delete tab_contents;
- LOG(INFO) << "Warning: Renderer is sending more popups to us than should "
- "be possible. Renderer compromised?";
+ VLOG(1) << "Warning: Renderer is sending more popups to us than should be "
+ "possible. Renderer compromised?";
return;
}
diff --git a/chrome/browser/browser_about_handler.cc b/chrome/browser/browser_about_handler.cc
index 3cba7dc..9590b87 100644
--- a/chrome/browser/browser_about_handler.cc
+++ b/chrome/browser/browser_about_handler.cc
@@ -986,7 +986,7 @@ void AboutMemoryHandler::OnDetailsAvailable() {
base::Int64ToString(aggregate.working_set.shareable)));
}
if (log_string.length() > 0)
- LOG(INFO) << "memory: " << log_string;
+ VLOG(1) << "memory: " << log_string;
// Set the browser & renderer detailed process data.
DictionaryValue* browser_data = new DictionaryValue();
diff --git a/chrome/browser/browser_main.cc b/chrome/browser/browser_main.cc
index c26ff0f..d2df447 100644
--- a/chrome/browser/browser_main.cc
+++ b/chrome/browser/browser_main.cc
@@ -1192,7 +1192,7 @@ int BrowserMain(const MainFunctionParams& parameters) {
!parsed_command_line.HasSwitch(switches::kLoginPassword)) {
std::string username =
parsed_command_line.GetSwitchValueASCII(switches::kLoginUser);
- LOG(INFO) << "Relaunching browser for user: " << username;
+ VLOG(1) << "Relaunching browser for user: " << username;
chromeos::UserManager::Get()->UserLoggedIn(username);
// Redirect logs.
diff --git a/chrome/browser/browser_main_posix.cc b/chrome/browser/browser_main_posix.cc
index e1fcb69..8081ef0 100644
--- a/chrome/browser/browser_main_posix.cc
+++ b/chrome/browser/browser_main_posix.cc
@@ -108,7 +108,7 @@ void ShutdownDetector::ThreadMain() {
bytes_read += ret;
} while (bytes_read < sizeof(signal));
- LOG(INFO) << "Handling shutdown for signal " << signal << ".";
+ VLOG(1) << "Handling shutdown for signal " << signal << ".";
if (!BrowserThread::PostTask(
BrowserThread::UI, FROM_HERE,
diff --git a/chrome/browser/browser_main_win.cc b/chrome/browser/browser_main_win.cc
index ef1dc17..65a991f 100644
--- a/chrome/browser/browser_main_win.cc
+++ b/chrome/browser/browser_main_win.cc
@@ -92,15 +92,15 @@ int DoUninstallTasks(bool chrome_still_running) {
if (ret != ResultCodes::UNINSTALL_USER_CANCEL) {
// The following actions are just best effort.
- LOG(INFO) << "Executing uninstall actions";
+ VLOG(1) << "Executing uninstall actions";
if (!FirstRun::RemoveSentinel())
- LOG(INFO) << "Failed to delete sentinel file.";
+ VLOG(1) << "Failed to delete sentinel file.";
// We want to remove user level shortcuts and we only care about the ones
// created by us and not by the installer so |alternate| is false.
if (!ShellUtil::RemoveChromeDesktopShortcut(ShellUtil::CURRENT_USER, false))
- LOG(INFO) << "Failed to delete desktop shortcut.";
+ VLOG(1) << "Failed to delete desktop shortcut.";
if (!ShellUtil::RemoveChromeQuickLaunchShortcut(ShellUtil::CURRENT_USER))
- LOG(INFO) << "Failed to delete quick launch shortcut.";
+ VLOG(1) << "Failed to delete quick launch shortcut.";
}
return ret;
}
diff --git a/chrome/browser/bug_report_util.cc b/chrome/browser/bug_report_util.cc
index c428924..db771cc 100644
--- a/chrome/browser/bug_report_util.cc
+++ b/chrome/browser/bug_report_util.cc
@@ -145,18 +145,18 @@ void BugReportUtil::PostCleanup::OnURLFetchComplete(
if (response_code == kHttpPostSuccessNoContent) {
error_stream << "Success";
} else if (response_code == kHttpPostFailNoConnection) {
- error_stream << "No connection to server.";
+ error_stream << "No connection to server.";
} else if ((response_code > kHttpPostFailClientError) &&
(response_code < kHttpPostFailServerError)) {
- error_stream << "Client error: HTTP response code " << response_code;
+ error_stream << "Client error: HTTP response code " << response_code;
} else if (response_code > kHttpPostFailServerError) {
- error_stream << "Server error: HTTP response code " << response_code;
+ error_stream << "Server error: HTTP response code " << response_code;
} else {
- error_stream << "Unknown error: HTTP response code " << response_code;
+ error_stream << "Unknown error: HTTP response code " << response_code;
}
- LOG(WARNING) << "Submission to feedback server (" << url <<
- ") status: " << error_stream.str() << std::endl;
+ LOG(WARNING) << "Submission to feedback server (" << url
+ << ") status: " << error_stream.str();
#if defined(OS_CHROMEOS)
// Show the notification to the user; this notification will stay active till
diff --git a/chrome/browser/external_tab_container_win.cc b/chrome/browser/external_tab_container_win.cc
index 0384e09..ffa0183 100644
--- a/chrome/browser/external_tab_container_win.cc
+++ b/chrome/browser/external_tab_container_win.cc
@@ -1092,7 +1092,7 @@ TemporaryPopupExternalTabContainer::TemporaryPopupExternalTabContainer(
}
TemporaryPopupExternalTabContainer::~TemporaryPopupExternalTabContainer() {
- DLOG(INFO) << __FUNCTION__;
+ DVLOG(1) << __FUNCTION__;
}
void TemporaryPopupExternalTabContainer::OpenURLFromTab(
diff --git a/chrome/browser/io_thread.cc b/chrome/browser/io_thread.cc
index f67a918..2aee17c 100644
--- a/chrome/browser/io_thread.cc
+++ b/chrome/browser/io_thread.cc
@@ -130,7 +130,7 @@ class LoggingNetworkChangeObserver
}
virtual void OnIPAddressChanged() {
- LOG(INFO) << "Observed a change to the network IP addresses";
+ VLOG(1) << "Observed a change to the network IP addresses";
net_log_->AddEntry(net::NetLog::TYPE_NETWORK_IP_ADDRESSES_CHANGED,
base::TimeTicks::Now(),
diff --git a/chrome/browser/options_util.cc b/chrome/browser/options_util.cc
index 698b2f1..caf0ee0 100644
--- a/chrome/browser/options_util.cc
+++ b/chrome/browser/options_util.cc
@@ -100,9 +100,7 @@ bool OptionsUtil::ResolveMetricsReportingEnabled(bool enabled) {
bool update_pref = GoogleUpdateSettings::GetCollectStatsConsent();
if (enabled != update_pref) {
- DLOG(INFO) <<
- "OptionsUtil: Unable to set crash report status to " <<
- enabled;
+ DVLOG(1) << "OptionsUtil: Unable to set crash report status to " << enabled;
}
// Only change the pref if GoogleUpdateSettings::GetCollectStatsConsent
diff --git a/chrome/browser/plugin_process_host.cc b/chrome/browser/plugin_process_host.cc
index 988395d..4b5f5a1 100644
--- a/chrome/browser/plugin_process_host.cc
+++ b/chrome/browser/plugin_process_host.cc
@@ -380,7 +380,7 @@ void PluginProcessHost::OnAccessFiles(int renderer_id,
for (size_t i = 0; i < files.size(); ++i) {
const FilePath path = FilePath::FromWStringHack(UTF8ToWide(files[i]));
if (!policy->CanReadFile(renderer_id, path)) {
- LOG(INFO) << "Denied unauthorized request for file " << files[i];
+ VLOG(1) << "Denied unauthorized request for file " << files[i];
*allowed = false;
return;
}
diff --git a/chrome/browser/process_singleton_win.cc b/chrome/browser/process_singleton_win.cc
index 5cbf2a5..7b56819 100644
--- a/chrome/browser/process_singleton_win.cc
+++ b/chrome/browser/process_singleton_win.cc
@@ -243,7 +243,7 @@ LRESULT ProcessSingleton::OnCopyData(HWND hwnd, const COPYDATASTRUCT* cds) {
if (msg.substr(0, first_null) == L"START") {
// Another instance is starting parse the command line & do what it would
// have done.
- LOG(INFO) << "Handling STARTUP request from another process";
+ VLOG(1) << "Handling STARTUP request from another process";
const std::wstring::size_type second_null =
msg.find_first_of(L'\0', first_null + 1);
if (second_null == std::wstring::npos ||
diff --git a/chrome/browser/profile_impl.cc b/chrome/browser/profile_impl.cc
index 4ed055b..8304c8d 100644
--- a/chrome/browser/profile_impl.cc
+++ b/chrome/browser/profile_impl.cc
@@ -940,8 +940,8 @@ void ProfileImpl::CreatePasswordStore() {
} else if (store_type == "detect") {
scoped_ptr<base::Environment> env(base::Environment::Create());
desktop_env = base::nix::GetDesktopEnvironment(env.get());
- LOG(INFO) << "Password storage detected desktop environment: " <<
- base::nix::GetDesktopEnvironmentName(desktop_env);
+ VLOG(1) << "Password storage detected desktop environment: "
+ << base::nix::GetDesktopEnvironmentName(desktop_env);
} else {
// TODO(mdm): If the flag is not given, or has an unknown value, use the
// default store for now. Once we're confident in the other stores, we can
@@ -952,26 +952,26 @@ void ProfileImpl::CreatePasswordStore() {
scoped_ptr<PasswordStoreX::NativeBackend> backend;
if (desktop_env == base::nix::DESKTOP_ENVIRONMENT_KDE4) {
// KDE3 didn't use DBus, which our KWallet store uses.
- LOG(INFO) << "Trying KWallet for password storage.";
+ VLOG(1) << "Trying KWallet for password storage.";
backend.reset(new NativeBackendKWallet());
if (backend->Init())
- LOG(INFO) << "Using KWallet for password storage.";
+ VLOG(1) << "Using KWallet for password storage.";
else
backend.reset();
} else if (desktop_env == base::nix::DESKTOP_ENVIRONMENT_GNOME ||
desktop_env == base::nix::DESKTOP_ENVIRONMENT_XFCE) {
#if defined(USE_GNOME_KEYRING)
- LOG(INFO) << "Trying GNOME keyring for password storage.";
+ VLOG(1) << "Trying GNOME keyring for password storage.";
backend.reset(new NativeBackendGnome());
if (backend->Init())
- LOG(INFO) << "Using GNOME keyring for password storage.";
+ VLOG(1) << "Using GNOME keyring for password storage.";
else
backend.reset();
#endif // defined(USE_GNOME_KEYRING)
}
// TODO(mdm): this can change to a WARNING when we detect by default.
if (!backend.get())
- LOG(INFO) << "Using default (unencrypted) store for password storage.";
+ VLOG(1) << "Using default (unencrypted) store for password storage.";
ps = new PasswordStoreX(login_db, this,
GetWebDataService(Profile::IMPLICIT_ACCESS),
diff --git a/chrome/browser/profile_manager_unittest.cc b/chrome/browser/profile_manager_unittest.cc
index 6e57a5d..24c3f0f 100644
--- a/chrome/browser/profile_manager_unittest.cc
+++ b/chrome/browser/profile_manager_unittest.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -109,7 +109,7 @@ TEST_F(ProfileManagerTest, LoggedInProfileDir) {
FilePath expected_logged_in(profile_dir);
EXPECT_EQ(expected_logged_in.value(),
profile_manager.GetCurrentProfileDir().value());
- LOG(INFO) << test_dir_.Append(profile_manager.GetCurrentProfileDir()).value();
+ VLOG(1) << test_dir_.Append(profile_manager.GetCurrentProfileDir()).value();
}
#endif
diff --git a/chrome/browser/shell_integration_linux.cc b/chrome/browser/shell_integration_linux.cc
index d3bc8f7..0a88c5d 100644
--- a/chrome/browser/shell_integration_linux.cc
+++ b/chrome/browser/shell_integration_linux.cc
@@ -279,9 +279,9 @@ bool ShellIntegration::GetDesktopShortcutTemplate(
for (std::vector<FilePath>::const_iterator i = search_paths.begin();
i != search_paths.end(); ++i) {
FilePath path = (*i).Append(template_filename);
- LOG(INFO) << "Looking for desktop file template in " << path.value();
+ VLOG(1) << "Looking for desktop file template in " << path.value();
if (file_util::PathExists(path)) {
- LOG(INFO) << "Found desktop file template at " << path.value();
+ VLOG(1) << "Found desktop file template at " << path.value();
return file_util::ReadFileToString(path, output);
}
}
diff --git a/chrome/browser/shell_integration_win.cc b/chrome/browser/shell_integration_win.cc
index 2d53d28..f358ffd 100644
--- a/chrome/browser/shell_integration_win.cc
+++ b/chrome/browser/shell_integration_win.cc
@@ -278,7 +278,7 @@ bool ShellIntegration::SetAsDefaultBrowser() {
return false;
}
- LOG(INFO) << "Chrome registered as default browser.";
+ VLOG(1) << "Chrome registered as default browser.";
return true;
}
diff --git a/chrome/browser/zygote_main_linux.cc b/chrome/browser/zygote_main_linux.cc
index 65a44ae..008d3a4 100644
--- a/chrome/browser/zygote_main_linux.cc
+++ b/chrome/browser/zygote_main_linux.cc
@@ -736,7 +736,7 @@ bool ZygoteMain(const MainFunctionParams& params) {
"Seccomp sandbox. Running renderers with Seccomp "
"sandboxing disabled.";
} else {
- LOG(INFO) << "Enabling experimental Seccomp sandbox.";
+ VLOG(1) << "Enabling experimental Seccomp sandbox.";
sandbox_flags |= ZygoteHost::kSandboxSeccomp;
}
}