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

Side by Side Diff: content/browser/renderer_host/render_widget_host_view_aura.cc

Issue 120503007: [Aura] Fix regressions breaking embedded flash fullscreen. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 11 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | ui/views/controls/webview/webview.h » ('j') | ui/views/controls/webview/webview.h » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/renderer_host/render_widget_host_view_aura.h" 5 #include "content/browser/renderer_host/render_widget_host_view_aura.h"
6 6
7 #include "base/auto_reset.h" 7 #include "base/auto_reset.h"
8 #include "base/basictypes.h" 8 #include "base/basictypes.h"
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/callback_helpers.h" 10 #include "base/callback_helpers.h"
(...skipping 476 matching lines...) Expand 10 before | Expand all | Expand 10 after
487 #if defined(OS_WIN) 487 #if defined(OS_WIN)
488 plugin_parent_window_ = NULL; 488 plugin_parent_window_ = NULL;
489 #endif 489 #endif
490 } 490 }
491 491
492 //////////////////////////////////////////////////////////////////////////////// 492 ////////////////////////////////////////////////////////////////////////////////
493 // RenderWidgetHostViewAura, RenderWidgetHostView implementation: 493 // RenderWidgetHostViewAura, RenderWidgetHostView implementation:
494 494
495 void RenderWidgetHostViewAura::InitAsChild( 495 void RenderWidgetHostViewAura::InitAsChild(
496 gfx::NativeView parent_view) { 496 gfx::NativeView parent_view) {
497 window_->SetType(ui::wm::WINDOW_TYPE_CONTROL);
miu 2014/01/07 06:47:23 I believe this is the correct type, given the comm
497 window_->Init(ui::LAYER_TEXTURED); 498 window_->Init(ui::LAYER_TEXTURED);
498 window_->SetName("RenderWidgetHostViewAura"); 499 window_->SetName("RenderWidgetHostViewAura");
499 } 500 }
500 501
501 void RenderWidgetHostViewAura::InitAsPopup( 502 void RenderWidgetHostViewAura::InitAsPopup(
502 RenderWidgetHostView* parent_host_view, 503 RenderWidgetHostView* parent_host_view,
503 const gfx::Rect& bounds_in_screen) { 504 const gfx::Rect& bounds_in_screen) {
504 popup_parent_host_view_ = 505 popup_parent_host_view_ =
505 static_cast<RenderWidgetHostViewAura*>(parent_host_view); 506 static_cast<RenderWidgetHostViewAura*>(parent_host_view);
506 507
(...skipping 2981 matching lines...) Expand 10 before | Expand all | Expand 10 after
3488 RenderWidgetHost* widget) { 3489 RenderWidgetHost* widget) {
3489 return new RenderWidgetHostViewAura(widget); 3490 return new RenderWidgetHostViewAura(widget);
3490 } 3491 }
3491 3492
3492 // static 3493 // static
3493 void RenderWidgetHostViewPort::GetDefaultScreenInfo(WebScreenInfo* results) { 3494 void RenderWidgetHostViewPort::GetDefaultScreenInfo(WebScreenInfo* results) {
3494 GetScreenInfoForWindow(results, NULL); 3495 GetScreenInfoForWindow(results, NULL);
3495 } 3496 }
3496 3497
3497 } // namespace content 3498 } // namespace content
OLDNEW
« no previous file with comments | « no previous file | ui/views/controls/webview/webview.h » ('j') | ui/views/controls/webview/webview.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698