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

Unified Diff: ui/views/controls/webview/webview.cc

Issue 10082037: Revert 132284 - Fix build bustage by correcting ifdef (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 8 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/controls/webview/webview.cc
===================================================================
--- ui/views/controls/webview/webview.cc (revision 132304)
+++ ui/views/controls/webview/webview.cc (working copy)
@@ -62,8 +62,11 @@
void WebView::OnWebContentsFocused(content::WebContents* web_contents) {
DCHECK(web_contents == web_contents_);
FocusManager* focus_manager = GetFocusManager();
- if (focus_manager)
- focus_manager->SetFocusedView(this);
+ if (!focus_manager) {
+ NOTREACHED();
+ return;
+ }
+ focus_manager->SetFocusedView(this);
}
////////////////////////////////////////////////////////////////////////////////
@@ -176,7 +179,7 @@
void WebView::DetachWebContents() {
if (web_contents_) {
wcv_holder_->Detach();
-#if defined(OS_WIN) && !defined(USE_AURA)
+#if defined(OS_WIN)
// TODO(beng): This should either not be necessary, or be done implicitly by
// NativeViewHostWin on Detach(). As it stands, this is needed
// so that the view of the detached contents knows to tell the
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698