diff options
-rw-r--r-- | chrome/browser/chrome_browser_main.cc | 4 | ||||
-rw-r--r-- | chrome/browser/chromeos/login/webui_login_display_host.cc | 2 | ||||
-rw-r--r-- | chrome/browser/chromeos/login/webui_login_view.cc | 2 | ||||
-rw-r--r-- | chrome/browser/ui/browser_init.cc | 30 | ||||
-rw-r--r-- | chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc | 17 | ||||
-rw-r--r-- | content/browser/renderer_host/render_view_host_impl.cc | 16 | ||||
-rw-r--r-- | content/browser/renderer_host/resource_dispatcher_host_impl.cc | 4 | ||||
-rw-r--r-- | content/renderer/render_view_impl.cc | 8 |
8 files changed, 0 insertions, 83 deletions
diff --git a/chrome/browser/chrome_browser_main.cc b/chrome/browser/chrome_browser_main.cc index 1b28cc4..c0aa18e 100644 --- a/chrome/browser/chrome_browser_main.cc +++ b/chrome/browser/chrome_browser_main.cc @@ -1820,10 +1820,6 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() { } bool ChromeBrowserMainParts::MainMessageLoopRun(int* result_code) { -#if defined(OS_CHROMEOS) - // crosbug.com/26646 - LOG(ERROR) << "MainMessageLoopRun"; -#endif // Set the result code set in PreMainMessageLoopRun or set above. *result_code = result_code_; diff --git a/chrome/browser/chromeos/login/webui_login_display_host.cc b/chrome/browser/chromeos/login/webui_login_display_host.cc index 560fcd4..dceb1a5 100644 --- a/chrome/browser/chromeos/login/webui_login_display_host.cc +++ b/chrome/browser/chromeos/login/webui_login_display_host.cc @@ -189,8 +189,6 @@ void WebUILoginDisplayHost::LoadURL(const GURL& url) { #endif login_view_->OnWindowCreated(); } - // crosbug.com/26646. - LOG(ERROR) << "LoadURL:" << url; login_view_->LoadURL(url); } diff --git a/chrome/browser/chromeos/login/webui_login_view.cc b/chrome/browser/chromeos/login/webui_login_view.cc index dce3924..1fa7d2b 100644 --- a/chrome/browser/chromeos/login/webui_login_view.cc +++ b/chrome/browser/chromeos/login/webui_login_view.cc @@ -327,8 +327,6 @@ void WebUILoginView::OnTabMainFrameRender() { #endif if (should_emit_login_prompt_visible_) { - // crosbug.com/26646. - LOG(ERROR) << "EmitLoginPromptVisible:"; chromeos::DBusThreadManager::Get()->GetSessionManagerClient()-> EmitLoginPromptVisible(); } diff --git a/chrome/browser/ui/browser_init.cc b/chrome/browser/ui/browser_init.cc index 853e6d1..9756b57 100644 --- a/chrome/browser/ui/browser_init.cc +++ b/chrome/browser/ui/browser_init.cc @@ -630,10 +630,6 @@ void RegisterComponentsForUpdate(const CommandLine& command_line) { RegisterPnaclComponent(cus); } -#if defined(OS_CHROMEOS) - // crosbug.com/26446. - LOG(ERROR) << "RegisterComponentsForUpdate Start"; -#endif cus->Start(); } @@ -1691,27 +1687,9 @@ bool BrowserInit::ProcessCmdLineImpl( int* return_code, BrowserInit* browser_init) { DCHECK(last_used_profile); -#if defined(OS_CHROMEOS) - const CommandLine::StringVector argv = command_line.argv(); - std::string cmd; - for (CommandLine::StringVector::const_iterator iter = argv.begin(); - iter != argv.end(); - ++iter) { - cmd += *iter + " "; - } - // crosbug.com/26446. - LOG(ERROR) << "ProcessCmdLineImpl: process_startup=" << process_startup - << ", cmd=" << cmd; -#endif - if (process_startup) { if (command_line.HasSwitch(switches::kDisablePromptOnRepost)) content::NavigationController::DisablePromptOnRepost(); - -#if defined(OS_CHROMEOS) - // crosbug.com/26446. - LOG(ERROR) << "RegisterComponentsForUpdate"; -#endif RegisterComponentsForUpdate(command_line); } @@ -1746,10 +1724,6 @@ bool BrowserInit::ProcessCmdLineImpl( expected_tab_count = std::max(1, static_cast<int>(urls_to_open.size())); } -#if defined(OS_CHROMEOS) - // crosbug.com/26446. - LOG(ERROR) << "CreatingAutomationProvider"; -#endif if (!CreateAutomationProvider<TestingAutomationProvider>( testing_channel_id, last_used_profile, @@ -1905,10 +1879,6 @@ bool BrowserInit::CreateAutomationProvider(const std::string& channel_id, #if defined(ENABLE_AUTOMATION) scoped_refptr<AutomationProviderClass> automation = new AutomationProviderClass(profile); -#if defined(OS_CHROMEOS) - // crosbug.com/26446. - LOG(ERROR) << "CreateAutomationProvider: channel=" << channel_id; -#endif if (!automation->InitializeChannel(channel_id)) return false; automation->SetExpectedTabCount(expected_tabs); 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 e80c142..4080c18 100644 --- a/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc +++ b/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc @@ -369,9 +369,6 @@ void SigninScreenHandler::GetLocalizedStrings( void SigninScreenHandler::Show(bool oobe_ui) { CHECK(delegate_); - LOG(ERROR) << "Show: oobe=" << oobe_ui - << ", page_is_ready=" << page_is_ready(); - oobe_ui_ = oobe_ui; if (!page_is_ready()) { show_on_init_ = true; @@ -401,14 +398,12 @@ void SigninScreenHandler::SetDelegate(SigninScreenHandlerDelegate* delegate) { } void SigninScreenHandler::OnNetworkReady() { - LOG(ERROR) << "network: " << network_state_informer_->active_network_id(); MaybePreloadAuthExtension(); } // SigninScreenHandler, private: ----------------------------------------------- void SigninScreenHandler::Initialize() { - LOG(ERROR) << "Initialize:" << delegate_; // If delegate_ is NULL here (e.g. WebUIScreenLocker has been destroyed), // don't do anything, just return. if (!delegate_) @@ -426,7 +421,6 @@ void SigninScreenHandler::Initialize() { } void SigninScreenHandler::RegisterMessages() { - LOG(ERROR) << "RegisterMessages"; network_state_informer_.reset(new NetworkStateInformer(this, web_ui())); network_state_informer_->Init(); @@ -526,7 +520,6 @@ void SigninScreenHandler::OnUserImageChanged(const User& user) { } void SigninScreenHandler::OnPreferencesChanged() { - LOG(ERROR) << "OnPreferenceChanged:" << delegate_; if (delegate_ && !delegate_->IsShowUsers()) HandleShowAddUser(NULL); else @@ -786,9 +779,6 @@ void SigninScreenHandler::HandleShowAddUser(const base::ListValue* args) { // |args| can be null if it's OOBE. if (args) args->GetString(0, &email_); - LOG(ERROR) << "HandleShowAddUser: email=" << email_ << ", gaia_sielnt_load=" - << gaia_silent_load_; - is_account_picker_showing_first_time_ = false; if (gaia_silent_load_ && email_.empty()) { @@ -899,10 +889,6 @@ void SigninScreenHandler::HandleAccountPickerReady( } void SigninScreenHandler::HandleLoginWebuiReady(const base::ListValue* args) { - // crosbug.com/26646. - LOG(ERROR) << "HandleLoginWebuiReady: focus_stolen=" << focus_stolen_ - << ", gaia_silent_load=" << gaia_silent_load_; - if (focus_stolen_) { // Set focus to the Gaia page. // TODO(altimofeev): temporary solution, until focus parameters are @@ -992,8 +978,6 @@ void SigninScreenHandler::HandleCreateAccount(const base::ListValue* args) { } void SigninScreenHandler::StartClearingDnsCache() { - LOG(ERROR) << "StartClearingDnsCache: cond:" - << (dns_clear_task_running_ || !g_browser_process->io_thread()); if (dns_clear_task_running_ || !g_browser_process->io_thread()) return; @@ -1007,7 +991,6 @@ void SigninScreenHandler::StartClearingDnsCache() { } void SigninScreenHandler::StartClearingCookies() { - LOG(ERROR) << "StartClearingCookies"; cookies_cleared_ = false; if (cookie_remover_) cookie_remover_->RemoveObserver(this); diff --git a/content/browser/renderer_host/render_view_host_impl.cc b/content/browser/renderer_host/render_view_host_impl.cc index 52f12f0..86dd7b2 100644 --- a/content/browser/renderer_host/render_view_host_impl.cc +++ b/content/browser/renderer_host/render_view_host_impl.cc @@ -1104,26 +1104,14 @@ void RenderViewHostImpl::OnMsgRequestMove(const gfx::Rect& pos) { } void RenderViewHostImpl::OnMsgDidStartLoading() { -#if defined(OS_CHROMEOS) - // crosbug.com/26646. - LOG(ERROR) << "DidStartLoading"; -#endif delegate_->DidStartLoading(); } void RenderViewHostImpl::OnMsgDidStopLoading() { -#if defined(OS_CHROMEOS) - // crosbug.com/26646. - LOG(ERROR) << "DidStopLoading"; -#endif delegate_->DidStopLoading(); } void RenderViewHostImpl::OnMsgDidChangeLoadProgress(double load_progress) { -#if defined(OS_CHROMEOS) - // crosbug.com/26646. - LOG(ERROR) << "DidChangeLoadProgress:" << load_progress; -#endif delegate_->DidChangeLoadProgress(load_progress); } @@ -1133,10 +1121,6 @@ void RenderViewHostImpl::OnMsgDocumentAvailableInMainFrame() { void RenderViewHostImpl::OnMsgDocumentOnLoadCompletedInMainFrame( int32 page_id) { -#if defined(OS_CHROMEOS) - // crosbug.com/26646. - LOG(ERROR) << "DocumentOnLoadCompletedInMainFrame:" << page_id; -#endif delegate_->DocumentOnLoadCompletedInMainFrame(this, page_id); } diff --git a/content/browser/renderer_host/resource_dispatcher_host_impl.cc b/content/browser/renderer_host/resource_dispatcher_host_impl.cc index 4b14ea5..76c0ea9 100644 --- a/content/browser/renderer_host/resource_dispatcher_host_impl.cc +++ b/content/browser/renderer_host/resource_dispatcher_host_impl.cc @@ -467,10 +467,6 @@ net::Error ResourceDispatcherHostImpl::BeginDownload( return CallbackAndReturn(started_callback, net::ERR_INSUFFICIENT_RESOURCES); const GURL& url = request->original_url(); -#if defined(OS_CHROMEOS) - // crosbug.com/26646. - VLOG(1) << "BeginDownload: " << request->url().spec(); -#endif const net::URLRequestContext* request_context = context->GetRequestContext(); request->set_referrer(MaybeStripReferrer(GURL(request->referrer())).spec()); request->set_context(request_context); diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc index d30c23a..23e91f6 100644 --- a/content/renderer/render_view_impl.cc +++ b/content/renderer/render_view_impl.cc @@ -934,10 +934,6 @@ void RenderViewImpl::OnNavigate(const ViewMsg_Navigate_Params& params) { WebString::fromUTF8(i.values())); } } -#if defined(OS_CHROMEOS) - // crosbug.com/26646. - LOG(ERROR) << " FrameLoader::loadRequest()"; -#endif main_frame->loadRequest(request); } @@ -1638,10 +1634,6 @@ bool RenderViewImpl::enumerateChosenDirectory( } void RenderViewImpl::didStartLoading() { -#if defined(OS_CHROMEOS) - // crosbug.com/26646. - LOG(ERROR) << "didStartLoading is_loading=" << is_loading_; -#endif if (is_loading_) { DVLOG(1) << "didStartLoading called while loading"; return; |