diff options
author | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-07 22:54:19 +0000 |
---|---|---|
committer | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-07 22:54:19 +0000 |
commit | 96fe2e2b224ff76f57f699df62b6cbbca1f9ac44 (patch) | |
tree | 13ef303bcb156c419dd8079b2d3c3a251540765e /chrome | |
parent | 498504a14eea6dcacf25fb59446b4ffb4c52267f (diff) | |
download | chromium_src-96fe2e2b224ff76f57f699df62b6cbbca1f9ac44.zip chromium_src-96fe2e2b224ff76f57f699df62b6cbbca1f9ac44.tar.gz chromium_src-96fe2e2b224ff76f57f699df62b6cbbca1f9ac44.tar.bz2 |
Reverting log messages that weren't useful.
BUG=chromium-os:26646
TEST=none
Review URL: http://codereview.chromium.org/9600070
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@125480 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r-- | chrome/browser/automation/automation_provider_observers.cc | 15 | ||||
-rw-r--r-- | chrome/browser/browsing_data_remover.cc | 16 | ||||
-rw-r--r-- | chrome/browser/chrome_browser_main.cc | 42 | ||||
-rw-r--r-- | chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc | 10 |
4 files changed, 3 insertions, 80 deletions
diff --git a/chrome/browser/automation/automation_provider_observers.cc b/chrome/browser/automation/automation_provider_observers.cc index 6dc3ea7..20c0dbf 100644 --- a/chrome/browser/automation/automation_provider_observers.cc +++ b/chrome/browser/automation/automation_provider_observers.cc @@ -119,10 +119,6 @@ InitialLoadObserver::InitialLoadObserver(size_t tab_count, crashed_tab_count_(0), outstanding_tab_count_(tab_count), init_time_(base::TimeTicks::Now()) { -#if defined(OS_CHROMEOS) - LOG(ERROR) << "InitialLoadObserver::Observe type=" << tab_count; -#endif - if (outstanding_tab_count_ > 0) { registrar_.Add(this, content::NOTIFICATION_LOAD_START, content::NotificationService::AllSources()); @@ -139,10 +135,6 @@ InitialLoadObserver::~InitialLoadObserver() { void InitialLoadObserver::Observe(int type, const content::NotificationSource& source, const content::NotificationDetails& details) { -#if defined(OS_CHROMEOS) - LOG(ERROR) << "InitialLoadObserver::Observe type=" << type; -#endif - if (type == content::NOTIFICATION_LOAD_START) { if (outstanding_tab_count_ > loading_tabs_.size()) loading_tabs_.insert(TabTimeMap::value_type( @@ -185,13 +177,6 @@ void InitialLoadObserver::Observe(int type, NOTREACHED(); } -#if defined(OS_CHROMEOS) - LOG(ERROR) << "InitialLoadObserver::Observe type=" << type - << ", finished=" << finished_tabs_.size() - << ", crashed=" << crashed_tab_count_ - << ", outstanding=" << outstanding_tab_count_; -#endif - if (finished_tabs_.size() + crashed_tab_count_ >= outstanding_tab_count_) ConditionMet(); } diff --git a/chrome/browser/browsing_data_remover.cc b/chrome/browser/browsing_data_remover.cc index 8388474..1adc128 100644 --- a/chrome/browser/browsing_data_remover.cc +++ b/chrome/browser/browsing_data_remover.cc @@ -332,10 +332,6 @@ void BrowsingDataRemover::RemoveImpl(int remove_mask, base::WaitableEvent* event = plugin_data_remover_->StartRemoving(delete_begin_); watcher_.StartWatching(event, this); - -#if defined(OS_CHROMEOS) - LOG(ERROR) << "Remove plugin data: waitable event=" << event; -#endif } if (remove_mask & REMOVE_PASSWORDS) { @@ -454,12 +450,6 @@ void BrowsingDataRemover::Observe(int type, // them to complete before continuing. DCHECK(type == chrome::NOTIFICATION_TEMPLATE_URL_SERVICE_LOADED); TemplateURLService* model = content::Source<TemplateURLService>(source).ptr(); - -#if defined(OS_CHROMEOS) - LOG(ERROR) << "BrowsingDataRemover::Observe " - << (model->profile() == profile_); -#endif - if (model->profile() == profile_) { registrar_.RemoveAll(); model->RemoveAutoGeneratedBetween(delete_begin_, delete_end_); @@ -468,9 +458,6 @@ void BrowsingDataRemover::Observe(int type, } void BrowsingDataRemover::NotifyAndDeleteIfDone() { -#if defined(OS_CHROMEOS) - LOG(ERROR) << "NotifyAndDeleteIfDone: all done=" << all_done(); -#endif // TODO(brettw) bug 1139736: see TODO in Observe() above. if (!all_done()) return; @@ -686,9 +673,6 @@ void BrowsingDataRemover::OnQuotaManagedDataDeleted() { void BrowsingDataRemover::OnWaitableEventSignaled( base::WaitableEvent* waitable_event) { waiting_for_clear_plugin_data_ = false; -#if defined(OS_CHROMEOS) - LOG(ERROR) << "OnWaitableEventSignaled:" << waitable_event; -#endif NotifyAndDeleteIfDone(); } diff --git a/chrome/browser/chrome_browser_main.cc b/chrome/browser/chrome_browser_main.cc index 9e5ee7d..31f6c68 100644 --- a/chrome/browser/chrome_browser_main.cc +++ b/chrome/browser/chrome_browser_main.cc @@ -1560,10 +1560,6 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() { // TODO(stevenjb): Move WIN and MACOSX specific code to apprpriate Parts. // (requires supporting early exit). -#if defined(OS_CHROMEOS) - // crosbug.com/26646 - LOG(ERROR) << "PostProfileInit()"; -#endif PostProfileInit(); // Show the First Run UI if this is the first time Chrome has been run on @@ -1589,10 +1585,7 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() { local_state_->SetBoolean(prefs::kMetricsReportingEnabled, true); #endif // OS_POSIX } // if (!first_run_ui_bypass_) -#if defined(OS_CHROMEOS) - // crosbug.com/26646 - LOG(ERROR) << "SetNewHomePagePrefs()"; -#endif + Browser::SetNewHomePagePrefs(profile_->GetPrefs()); browser_process_->profile_manager()->OnImportFinished(profile_); } // if (is_first_run_) @@ -1649,10 +1642,6 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() { #endif // GOOGLE_CHROME_BUILD #endif // OS_WIN -#if defined(OS_CHROMEOS) - // crosbug.com/26646. - LOG(ERROR) << "NetModule::SetResourceProvider()"; -#endif // Configure modules that need access to resources. net::NetModule::SetResourceProvider(chrome_common_net::NetResourceProvider); @@ -1708,10 +1697,6 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() { } #endif -#if defined(OS_CHROMEOS) - // crosbug.com/26646 - LOG(ERROR) << "HandleTestParameters()"; -#endif HandleTestParameters(parsed_command_line()); RecordBreakpadStatusUMA(browser_process_->metrics_service()); about_flags::RecordUMAStatistics(local_state_); @@ -1750,52 +1735,27 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() { // TODO(torne): this should maybe be done with // ProfileKeyedServiceFactory::ServiceIsCreatedWithProfile() instead? #if !defined(OS_ANDROID) - -#if defined(OS_CHROMEOS) - // crosbug.com/26646 - LOG(ERROR) << "CouldPrintProxyServiceFactory()"; -#endif CloudPrintProxyServiceFactory::GetForProfile(profile_); #endif // Load GPU Blacklist. -#if defined(OS_CHROMEOS) - // crosbug.com/26646 - LOG(ERROR) << "InitializeGpuDataManager()"; -#endif InitializeGpuDataManager(parsed_command_line()); // Start watching all browser threads for responsiveness. ThreadWatcherList::StartWatchingAll(parsed_command_line()); #if !defined(DISABLE_NACL) -#if defined(OS_CHROMEOS) - // crosbug.com/26646 - LOG(ERROR) << "EarlyStartup()"; -#endif NaClProcessHost::EarlyStartup(); #endif -#if defined(OS_CHROMEOS) - // crosbug.com/26646 - LOG(ERROR) << "PreBrowserStart()"; -#endif PreBrowserStart(); -#if defined(OS_CHROMEOS) - // crosbug.com/26646 - LOG(ERROR) << "notification_ui_manager()"; -#endif // Instantiate the notification UI manager, as this triggers a perf timer // used to measure startup time. TODO(stevenjb): Figure out what is actually // triggering the timer and call that explicitly in the approprate place. // http://crbug.com/105065. browser_process_->notification_ui_manager(); -#if defined(OS_CHROMEOS) - // crosbug.com/26646 - LOG(ERROR) << "Before calling Start() :" << parameters().ui_task; -#endif if (parameters().ui_task) { // We are in test mode. Run one task and enter the main message loop. #if defined(OS_MACOSX) diff --git a/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc index 2a2e25e..c17d32f 100644 --- a/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc +++ b/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc @@ -513,8 +513,6 @@ void SigninScreenHandler::ShowGaiaPasswordChanged(const std::string& username) { void SigninScreenHandler::OnBrowsingDataRemoverDone() { DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); - LOG(ERROR) << "OnBrowsingDataRemoverDone"; - cookie_remover_ = NULL; cookies_cleared_ = true; ShowSigninScreenIfReady(); @@ -539,17 +537,12 @@ void SigninScreenHandler::Observe(int type, void SigninScreenHandler::OnDnsCleared() { DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); - LOG(ERROR) << "OnDnsCleared"; - dns_clear_task_running_ = false; dns_cleared_ = true; ShowSigninScreenIfReady(); } void SigninScreenHandler::ShowSigninScreenIfReady() { - LOG(ERROR) << "ShowSigninScreenIfReady: dns=" << dns_cleared_ - << ", cookie=" << cookies_cleared_; - if (!dns_cleared_ || !cookies_cleared_) return; @@ -626,7 +619,7 @@ void SigninScreenHandler::UpdateAuthExtension() { void SigninScreenHandler::ShowSigninScreenForCreds( const std::string& username, const std::string& password) { - LOG(ERROR) << "ShowSigninScreenForCreds " << username << " " << password; + VLOG(2) << "ShowSigninScreenForCreds " << username << " " << password; test_user_ = username; test_pass_ = password; @@ -842,6 +835,7 @@ void SigninScreenHandler::HandleAccountPickerReady( } void SigninScreenHandler::HandleLoginWebuiReady(const base::ListValue* args) { + // crosbug.com/26646. LOG(ERROR) << "HandleLoginWebuiReady: first_webui_ready=" << is_first_webui_ready_ << ", first_attempt=" << is_first_attempt_; |