Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(460)

Side by Side Diff: content/browser/web_contents/web_contents_impl.cc

Issue 18799006: Extension Error Piping - Blink: Chrome Side (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Include backwards-compatible method for staggered landing with Blink Created 7 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/browser/web_contents/web_contents_impl.h" 5 #include "content/browser/web_contents/web_contents_impl.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/debug/trace_event.h" 10 #include "base/debug/trace_event.h"
(...skipping 3407 matching lines...) Expand 10 before | Expand all | Expand 10 after
3418 dialog_manager_ = delegate_->GetJavaScriptDialogManager(); 3418 dialog_manager_ = delegate_->GetJavaScriptDialogManager();
3419 dialog_manager_->RunBeforeUnloadDialog( 3419 dialog_manager_->RunBeforeUnloadDialog(
3420 this, message, is_reload, 3420 this, message, is_reload,
3421 base::Bind(&WebContentsImpl::OnDialogClosed, base::Unretained(this), rvh, 3421 base::Bind(&WebContentsImpl::OnDialogClosed, base::Unretained(this), rvh,
3422 reply_msg)); 3422 reply_msg));
3423 } 3423 }
3424 3424
3425 bool WebContentsImpl::AddMessageToConsole(int32 level, 3425 bool WebContentsImpl::AddMessageToConsole(int32 level,
3426 const string16& message, 3426 const string16& message,
3427 int32 line_no, 3427 int32 line_no,
3428 const string16& source_id) { 3428 const string16& source_id,
3429 const string16& stack_trace) {
3429 if (!delegate_) 3430 if (!delegate_)
3430 return false; 3431 return false;
3431 return delegate_->AddMessageToConsole(this, level, message, line_no, 3432 return delegate_->AddMessageToConsole(this, level, message, line_no,
3432 source_id); 3433 source_id);
3433 } 3434 }
3434 3435
3435 WebPreferences WebContentsImpl::GetWebkitPrefs() { 3436 WebPreferences WebContentsImpl::GetWebkitPrefs() {
3436 // We want to base the page config off of the real URL, rather than the 3437 // We want to base the page config off of the real URL, rather than the
3437 // display URL. 3438 // display URL.
3438 GURL url = controller_.GetActiveEntry() 3439 GURL url = controller_.GetActiveEntry()
(...skipping 298 matching lines...) Expand 10 before | Expand all | Expand 10 after
3737 } 3738 }
3738 3739
3739 void WebContentsImpl::ClearAllPowerSaveBlockers() { 3740 void WebContentsImpl::ClearAllPowerSaveBlockers() {
3740 for (PowerSaveBlockerMap::iterator i(power_save_blockers_.begin()); 3741 for (PowerSaveBlockerMap::iterator i(power_save_blockers_.begin());
3741 i != power_save_blockers_.end(); ++i) 3742 i != power_save_blockers_.end(); ++i)
3742 STLDeleteValues(&power_save_blockers_[i->first]); 3743 STLDeleteValues(&power_save_blockers_[i->first]);
3743 power_save_blockers_.clear(); 3744 power_save_blockers_.clear();
3744 } 3745 }
3745 3746
3746 } // namespace content 3747 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698