diff options
author | pkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-23 01:39:24 +0000 |
---|---|---|
committer | pkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-23 01:39:24 +0000 |
commit | e24c2c9b8b247f53ac3f522a77625a84958866ab (patch) | |
tree | 569cd8ca37539e81da8e7a3cc05ec5ac804bda4f /chrome/browser | |
parent | 79c8d20c40b92479245ea41d8673f01b5ae4e92e (diff) | |
download | chromium_src-e24c2c9b8b247f53ac3f522a77625a84958866ab.zip chromium_src-e24c2c9b8b247f53ac3f522a77625a84958866ab.tar.gz chromium_src-e24c2c9b8b247f53ac3f522a77625a84958866ab.tar.bz2 |
Convert LOG(INFO) to VLOG(1) - misc. chrome/browser/chromeos/*.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/4013001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@63612 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
13 files changed, 53 insertions, 54 deletions
diff --git a/chrome/browser/chromeos/audio_handler.cc b/chrome/browser/chromeos/audio_handler.cc index f069b18..a463e29 100644 --- a/chrome/browser/chromeos/audio_handler.cc +++ b/chrome/browser/chromeos/audio_handler.cc @@ -58,7 +58,7 @@ void AudioHandler::AdjustVolumeByPercent(double adjust_by_percent) { if (!VerifyMixerConnection()) return; - DLOG(INFO) << "Adjusting Volume by " << adjust_by_percent << " percent"; + DVLOG(1) << "Adjusting Volume by " << adjust_by_percent << " percent"; double volume = mixer_->GetVolumeDb(); double pct = VolumeDbToPercent(volume); @@ -90,14 +90,14 @@ void AudioHandler::SetMute(bool do_mute) { if (!VerifyMixerConnection()) return; - DLOG(INFO) << "Setting Mute to " << do_mute; + DVLOG(1) << "Setting Mute to " << do_mute; mixer_->SetMute(do_mute); } void AudioHandler::OnMixerInitialized(bool success) { connected_ = success; - DLOG(INFO) << "OnMixerInitialized, success = " << success; + DVLOG(1) << "OnMixerInitialized, success = " << success; } AudioHandler::AudioHandler() @@ -132,8 +132,8 @@ bool AudioHandler::VerifyMixerConnection() { if (reconnect_tries_ < kMaxReconnectTries) { reconnect_tries_++; - LOG(INFO) << "Re-connecting to PulseAudio attempt " << reconnect_tries_ - << "/" << kMaxReconnectTries; + VLOG(1) << "Re-connecting to PulseAudio attempt " << reconnect_tries_ << "/" + << kMaxReconnectTries; mixer_.reset(new PulseAudioMixer()); connected_ = mixer_->InitSync(); if (connected_) { diff --git a/chrome/browser/chromeos/cros_settings_provider_stats.cc b/chrome/browser/chromeos/cros_settings_provider_stats.cc index 6a49f59..6d23d31 100644 --- a/chrome/browser/chromeos/cros_settings_provider_stats.cc +++ b/chrome/browser/chromeos/cros_settings_provider_stats.cc @@ -35,7 +35,7 @@ bool MetricsCrosSettingsProvider::Get(const std::string& path, // static bool MetricsCrosSettingsProvider::SetMetricsStatus(bool enabled) { - LOG(INFO) << "Setting cros stats/crash metric reporting to " << enabled; + VLOG(1) << "Setting cros stats/crash metric reporting to " << enabled; if (enabled != GoogleUpdateSettings::GetCollectStatsConsent()) { bool new_enabled = OptionsUtil::ResolveMetricsReportingEnabled(enabled); #if defined(USE_LINUX_BREAKPAD) diff --git a/chrome/browser/chromeos/cros_settings_provider_user.cc b/chrome/browser/chromeos/cros_settings_provider_user.cc index 3094d14..44235ae 100644 --- a/chrome/browser/chromeos/cros_settings_provider_user.cc +++ b/chrome/browser/chromeos/cros_settings_provider_user.cc @@ -147,14 +147,14 @@ void UserCrosSettingsProvider::Set(const std::string& path, Value* in_value) { SignedSettingsHelper::Get()->StartStorePropertyOp(path, value, this); UpdateCacheBool(path.c_str(), bool_value); - LOG(INFO) << "Set cros setting " << path << "=" << value; + VLOG(1) << "Set cros setting " << path << "=" << value; } } else if (path == kDeviceOwner) { LOG(INFO) << "Setting owner is not supported. " << "Please use 'UpdateCachedOwner' instead."; } else if (path == kAccountsPrefUsers) { - LOG(INFO) << "Setting user whitelist is not implemented." - << "Please use whitelist/unwhitelist instead."; + VLOG(1) << "Setting user whitelist is not implemented. Please use " + "whitelist/unwhitelist instead."; } else { LOG(WARNING) << "Try to set unhandled cros setting " << path; } @@ -185,7 +185,7 @@ bool UserCrosSettingsProvider::HandlesSetting(const std::string& path) { void UserCrosSettingsProvider::OnWhitelistCompleted(bool success, const std::string& email) { - LOG(INFO) << "Add " << email << " to whitelist, success=" << success; + VLOG(1) << "Add " << email << " to whitelist, success=" << success; // Reload the whitelist on settings op failure. if (!success) @@ -194,7 +194,7 @@ void UserCrosSettingsProvider::OnWhitelistCompleted(bool success, void UserCrosSettingsProvider::OnUnwhitelistCompleted(bool success, const std::string& email) { - LOG(INFO) << "Remove " << email << " from whitelist, success=" << success; + VLOG(1) << "Remove " << email << " from whitelist, success=" << success; // Reload the whitelist on settings op failure. if (!success) @@ -203,8 +203,8 @@ void UserCrosSettingsProvider::OnUnwhitelistCompleted(bool success, void UserCrosSettingsProvider::OnStorePropertyCompleted( bool success, const std::string& name, const std::string& value) { - LOG(INFO) << "Store cros setting " << name << "=" << value - << ", success=" << success; + VLOG(1) << "Store cros setting " << name << "=" << value << ", success=" + << success; // Reload the setting if store op fails. if (!success) @@ -218,7 +218,7 @@ void UserCrosSettingsProvider::OnRetrievePropertyCompleted( return; } - LOG(INFO) << "Retrieved cros setting " << name << "=" << value; + VLOG(1) << "Retrieved cros setting " << name << "=" << value; if (bool_settings_.count(name)) { UpdateCacheBool(name.c_str(), value == "true" ? true : false); diff --git a/chrome/browser/chromeos/frame/panel_controller.cc b/chrome/browser/chromeos/frame/panel_controller.cc index 2f3f7eb..bfdc915 100644 --- a/chrome/browser/chromeos/frame/panel_controller.cc +++ b/chrome/browser/chromeos/frame/panel_controller.cc @@ -315,7 +315,7 @@ void PanelController::OnCloseButtonPressed() { PanelController::TitleContentView::TitleContentView( PanelController* panel_controller) : panel_controller_(panel_controller) { - LOG(INFO) << "panel: c " << this; + VLOG(1) << "panel: c " << this; InitializeResources(); close_button_ = new views::ImageButton(this); close_button_->SetImage(views::CustomButton::BS_NORMAL, close_button_n); @@ -401,7 +401,7 @@ void PanelController::TitleContentView::ButtonPressed( } PanelController::TitleContentView::~TitleContentView() { - LOG(INFO) << "panel: delete " << this; + VLOG(1) << "panel: delete " << this; } } // namespace chromeos diff --git a/chrome/browser/chromeos/network_state_notifier.cc b/chrome/browser/chromeos/network_state_notifier.cc index 5e23247..aaaf763 100644 --- a/chrome/browser/chromeos/network_state_notifier.cc +++ b/chrome/browser/chromeos/network_state_notifier.cc @@ -47,8 +47,7 @@ void NetworkStateNotifier::NetworkChanged(NetworkLibrary* cros) { void NetworkStateNotifier::UpdateNetworkState( NetworkStateDetails::State new_state) { - DLOG(INFO) << "UpdateNetworkState: new=" - << new_state << ", old=" << state_; + DVLOG(1) << "UpdateNetworkState: new=" << new_state << ", old=" << state_; if (state_ == NetworkStateDetails::CONNECTED && new_state != NetworkStateDetails::CONNECTED) { offline_start_time_ = Time::Now(); diff --git a/chrome/browser/chromeos/notifications/balloon_collection_impl.cc b/chrome/browser/chromeos/notifications/balloon_collection_impl.cc index 1cc3740..56a3d1c 100644 --- a/chrome/browser/chromeos/notifications/balloon_collection_impl.cc +++ b/chrome/browser/chromeos/notifications/balloon_collection_impl.cc @@ -160,7 +160,7 @@ void BalloonCollectionImpl::Observe(NotificationType type, // BalloonViewImpl before IO thread gets deleted in the // BrowserProcessImpl's destructor. See http://crbug.com/40810 // for details. - if(app_closing) + if (app_closing) Shutdown(); } @@ -168,7 +168,7 @@ void BalloonCollectionImpl::Shutdown() { // We need to remove the panel first because deleting // views that are not owned by parent will not remove // themselves from the parent. - DLOG(INFO) << "Shutting down notification UI"; + DVLOG(1) << "Shutting down notification UI"; notification_ui_.reset(); STLDeleteElements(&balloons_); } diff --git a/chrome/browser/chromeos/notifications/notification_panel.cc b/chrome/browser/chromeos/notifications/notification_panel.cc index 2b48256..1ff6014 100644 --- a/chrome/browser/chromeos/notifications/notification_panel.cc +++ b/chrome/browser/chromeos/notifications/notification_panel.cc @@ -271,7 +271,7 @@ namespace chromeos { class BalloonContainer : public views::View { public: - BalloonContainer(int margin) + explicit BalloonContainer(int margin) : margin_(margin), sticky_container_(new BalloonSubContainer(margin)), non_sticky_container_(new BalloonSubContainer(margin)) { @@ -700,7 +700,7 @@ void NotificationPanel::ScrollBalloonToVisible(Balloon* balloon) { void NotificationPanel::UpdatePanel(bool update_container_size) { if (update_container_size) UpdateContainerBounds(); - switch(state_) { + switch (state_) { case KEEP_SIZE: { gfx::Rect min_bounds = GetPreferredBounds(); gfx::Rect panel_bounds; @@ -806,8 +806,8 @@ void NotificationPanel::OnStale(BalloonViewImpl* view) { void NotificationPanel::SetState(State new_state, const char* name) { #if !defined(NDEBUG) - DLOG(INFO) << "state transition " << ToStr(state_) << " >> " - << ToStr(new_state) << " in " << name; + DVLOG(1) << "state transition " << ToStr(state_) << " >> " << ToStr(new_state) + << " in " << name; #endif state_ = new_state; } diff --git a/chrome/browser/chromeos/offline/offline_load_page.cc b/chrome/browser/chromeos/offline/offline_load_page.cc index c3b88d5..63c9eae 100644 --- a/chrome/browser/chromeos/offline/offline_load_page.cc +++ b/chrome/browser/chromeos/offline/offline_load_page.cc @@ -124,8 +124,8 @@ void OfflineLoadPage::Observe(NotificationType type, if (type.value == NotificationType::NETWORK_STATE_CHANGED) { chromeos::NetworkStateDetails* state_details = Details<chromeos::NetworkStateDetails>(details).ptr(); - DLOG(INFO) << "NetworkStateChanaged notification received: state=" - << state_details->state(); + DVLOG(1) << "NetworkStateChanaged notification received: state=" + << state_details->state(); if (state_details->state() == chromeos::NetworkStateDetails::CONNECTED) { registrar_.Remove(this, NotificationType::NETWORK_STATE_CHANGED, diff --git a/chrome/browser/chromeos/offline/offline_load_service.cc b/chrome/browser/chromeos/offline/offline_load_service.cc index a75fba6..08f2362 100644 --- a/chrome/browser/chromeos/offline/offline_load_service.cc +++ b/chrome/browser/chromeos/offline/offline_load_service.cc @@ -62,8 +62,8 @@ bool OfflineLoadService::ShouldProceed(int process_host_id, process_host_id, render_view_id); DCHECK(tab_contents); bool proceed = tabs_.find(tab_contents) != tabs_.end(); - DLOG(INFO) << "ShouldProceed:" << proceed << ", url=" << url.spec() - << ", tab_contents=" << tab_contents; + DVLOG(1) << "ShouldProceed:" << proceed << ", url=" << url.spec() + << ", tab_contents=" << tab_contents; return proceed; } @@ -75,8 +75,8 @@ void OfflineLoadService::Proceeded(int process_host_id, process_host_id, render_view_id); DCHECK(tab_contents); if (tabs_.find(tab_contents) == tabs_.end()) { - DLOG(INFO) << "Proceeded: url=" << url.spec() - << ", tab_contents=" << tab_contents; + DVLOG(1) << "Proceeded: url=" << url.spec() + << ", tab_contents=" << tab_contents; tabs_.insert(tab_contents); BrowserThread::PostTask( BrowserThread::UI, FROM_HERE, diff --git a/chrome/browser/chromeos/preferences.cc b/chrome/browser/chromeos/preferences.cc index 2e1e0e2..8d66c82 100644 --- a/chrome/browser/chromeos/preferences.cc +++ b/chrome/browser/chromeos/preferences.cc @@ -404,7 +404,7 @@ void Preferences::SetLanguageConfigStringList( void Preferences::SetLanguageConfigStringListAsCSV(const char* section, const char* name, const std::string& value) { - LOG(INFO) << "Setting " << name << " to '" << value << "'"; + VLOG(1) << "Setting " << name << " to '" << value << "'"; std::vector<std::string> split_values; if (!value.empty()) diff --git a/chrome/browser/chromeos/proxy_config_service_impl.cc b/chrome/browser/chromeos/proxy_config_service_impl.cc index 888b604..539afad 100644 --- a/chrome/browser/chromeos/proxy_config_service_impl.cc +++ b/chrome/browser/chromeos/proxy_config_service_impl.cc @@ -358,10 +358,10 @@ ProxyConfigServiceImpl::ProxyConfigServiceImpl() retrieve_property_op_ = SignedSettings::CreateRetrievePropertyOp( kSettingProxyEverywhere, this); if (retrieve_property_op_ && retrieve_property_op_->Execute()) { - LOG(INFO) << "Start retrieving proxy setting from device"; + VLOG(1) << "Start retrieving proxy setting from device"; use_default = false; } else { - LOG(INFO) << "Fail to retrieve proxy setting from device"; + VLOG(1) << "Fail to retrieve proxy setting from device"; } } if (use_default) @@ -413,7 +413,7 @@ bool ProxyConfigServiceImpl::UISetProxyConfigToPACScript(const GURL& pac_url) { OnUISetProxyConfig(true); return true; } - LOG(INFO) << "Cannot set proxy: invalid pac url"; + VLOG(1) << "Cannot set proxy: invalid pac url"; return false; } @@ -427,7 +427,7 @@ bool ProxyConfigServiceImpl::UISetProxyConfigToSingleProxy( OnUISetProxyConfig(true); return true; } - LOG(INFO) << "Cannot set proxy: invalid single server"; + VLOG(1) << "Cannot set proxy: invalid single server"; return false; } @@ -454,7 +454,7 @@ bool ProxyConfigServiceImpl::UISetProxyConfigToProxyPerScheme( OnUISetProxyConfig(true); return true; } - LOG(INFO) << "Cannot set proxy: invalid " << scheme << " server"; + VLOG(1) << "Cannot set proxy: invalid " << scheme << " server"; return false; } @@ -466,8 +466,8 @@ bool ProxyConfigServiceImpl::UISetProxyConfigBypassRules( reference_config_.mode == ProxyConfig::MODE_PROXY_PER_SCHEME); if (reference_config_.mode != ProxyConfig::MODE_SINGLE_PROXY && reference_config_.mode != ProxyConfig::MODE_PROXY_PER_SCHEME) { - LOG(INFO) << "Cannot set bypass rules for proxy mode [" - << reference_config_.mode << "]"; + VLOG(1) << "Cannot set bypass rules for proxy mode [" + << reference_config_.mode << "]"; return false; } reference_config_.bypass_rules = bypass_rules; @@ -501,14 +501,14 @@ bool ProxyConfigServiceImpl::IOGetProxyConfig(net::ProxyConfig* net_config) { } void ProxyConfigServiceImpl::OnSettingsOpSucceeded(bool value) { - LOG(INFO) << "Stored proxy setting to device"; + VLOG(1) << "Stored proxy setting to device"; store_property_op_ = NULL; if (persist_to_device_pending_) PersistConfigToDevice(); } void ProxyConfigServiceImpl::OnSettingsOpSucceeded(std::string value) { - LOG(INFO) << "Retrieved proxy setting from device, value=[" << value << "]"; + VLOG(1) << "Retrieved proxy setting from device, value=[" << value << "]"; if (reference_config_.Deserialize(value)) { OnUISetProxyConfig(false); } else { @@ -534,7 +534,7 @@ void ProxyConfigServiceImpl::OnSettingsOpFailed() { //------------------ ProxyConfigServiceImpl: private methods ------------------- void ProxyConfigServiceImpl::InitConfigToDefault(bool post_to_io_thread) { - LOG(INFO) << "Using default proxy config: auto-detect"; + VLOG(1) << "Using default proxy config: auto-detect"; reference_config_.mode = ProxyConfig::MODE_AUTO_DETECT; reference_config_.automatic_proxy.source = ProxyConfig::SOURCE_OWNER; if (post_to_io_thread && can_post_task_) { @@ -551,14 +551,14 @@ void ProxyConfigServiceImpl::PersistConfigToDevice() { persist_to_device_pending_ = false; std::string value; if (!reference_config_.Serialize(&value)) { - LOG(INFO) << "Error serializing proxy config"; + VLOG(1) << "Error serializing proxy config"; return; } store_property_op_ = SignedSettings::CreateStorePropertyOp( kSettingProxyEverywhere, value, this); bool rc = store_property_op_->Execute(); - LOG(INFO) << "Start storing proxy setting to device, value=" << value - << ", rc=" << rc; + VLOG(1) << "Start storing proxy setting to device, value=" << value << ", rc=" + << rc; } void ProxyConfigServiceImpl::OnUISetProxyConfig(bool persist_to_device) { @@ -567,14 +567,14 @@ void ProxyConfigServiceImpl::OnUISetProxyConfig(bool persist_to_device) { Task* task = NewRunnableMethod(this, &ProxyConfigServiceImpl::IOSetProxyConfig, reference_config_); if (!BrowserThread::PostTask(BrowserThread::IO, FROM_HERE, task)) { - LOG(INFO) << "Couldn't post task to IO thread to set new proxy config"; + VLOG(1) << "Couldn't post task to IO thread to set new proxy config"; delete task; } if (persist_to_device && CrosLibrary::Get()->EnsureLoaded()) { if (store_property_op_) { persist_to_device_pending_ = true; - LOG(INFO) << "Pending persisting proxy setting to device"; + VLOG(1) << "Pending persisting proxy setting to device"; } else { PersistConfigToDevice(); } @@ -592,7 +592,7 @@ void ProxyConfigServiceImpl::CheckCurrentlyOnUIThread() { void ProxyConfigServiceImpl::IOSetProxyConfig(const ProxyConfig& new_config) { // This is called on the IO thread (posted from UI thread). CheckCurrentlyOnIOThread(); - LOG(INFO) << "Proxy configuration changed"; + VLOG(1) << "Proxy configuration changed"; has_config_ = true; cached_config_ = new_config; // Notify observers of new proxy config. diff --git a/chrome/browser/chromeos/proxy_config_service_impl_unittest.cc b/chrome/browser/chromeos/proxy_config_service_impl_unittest.cc index b1812a6..5e5f0f3 100644 --- a/chrome/browser/chromeos/proxy_config_service_impl_unittest.cc +++ b/chrome/browser/chromeos/proxy_config_service_impl_unittest.cc @@ -552,8 +552,8 @@ TEST_F(ProxyConfigServiceImplTest, SerializeAndDeserialize) { src_serializer.Serialize(*net_src_cfg.ToValue()); JSONStringValueSerializer tgt_serializer(&tgt_output); tgt_serializer.Serialize(*net_tgt_cfg.ToValue()); - LOG(INFO) << "source:\n" << src_output; - LOG(INFO) << "target:\n" << tgt_output; + VLOG(1) << "source:\n" << src_output + << "\ntarget:\n" << tgt_output; } #endif // !defined(NDEBUG) EXPECT_TRUE(net_src_cfg.Equals(net_tgt_cfg)); diff --git a/chrome/browser/chromeos/usb_mount_observer.cc b/chrome/browser/chromeos/usb_mount_observer.cc index fbfb501..3d0695f 100644 --- a/chrome/browser/chromeos/usb_mount_observer.cc +++ b/chrome/browser/chromeos/usb_mount_observer.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2009 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. @@ -105,13 +105,13 @@ void USBMountObserver::MountChanged(chromeos::MountLibrary* obj, } } } - LOG(INFO) << "Got added mount:" << path; + VLOG(1) << "Got added mount: " << path; } else if (evt == chromeos::DISK_REMOVED || evt == chromeos::DEVICE_REMOVED) { RemoveBrowserFromVector(path); } else if (evt == chromeos::DISK_CHANGED) { BrowserIterator iter = FindBrowserForPath(path); - LOG(INFO) << "Got changed mount:" << path; + VLOG(1) << "Got changed mount: " << path; if (iter == browsers_.end()) { // We don't currently have this one, so it must have been // mounted @@ -142,10 +142,10 @@ void USBMountObserver::MountChanged(chromeos::MountLibrary* obj, } } } else if (evt == chromeos::DEVICE_ADDED) { - LOG(INFO) << "Got device added" << path; + VLOG(1) << "Got device added: " << path; OpenFileBrowse(kFilebrowseScanning, path, true); } else if (evt == chromeos::DEVICE_SCANNED) { - LOG(INFO) << "Got device scanned:" << path; + VLOG(1) << "Got device scanned: " << path; } } |