OLD | NEW |
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 478 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
489 #if defined(OS_WIN) | 489 #if defined(OS_WIN) |
490 plugin_parent_window_ = NULL; | 490 plugin_parent_window_ = NULL; |
491 #endif | 491 #endif |
492 } | 492 } |
493 | 493 |
494 //////////////////////////////////////////////////////////////////////////////// | 494 //////////////////////////////////////////////////////////////////////////////// |
495 // RenderWidgetHostViewAura, RenderWidgetHostView implementation: | 495 // RenderWidgetHostViewAura, RenderWidgetHostView implementation: |
496 | 496 |
497 void RenderWidgetHostViewAura::InitAsChild( | 497 void RenderWidgetHostViewAura::InitAsChild( |
498 gfx::NativeView parent_view) { | 498 gfx::NativeView parent_view) { |
| 499 window_->SetType(ui::wm::WINDOW_TYPE_CONTROL); |
499 window_->Init(aura::WINDOW_LAYER_TEXTURED); | 500 window_->Init(aura::WINDOW_LAYER_TEXTURED); |
500 window_->SetName("RenderWidgetHostViewAura"); | 501 window_->SetName("RenderWidgetHostViewAura"); |
501 } | 502 } |
502 | 503 |
503 void RenderWidgetHostViewAura::InitAsPopup( | 504 void RenderWidgetHostViewAura::InitAsPopup( |
504 RenderWidgetHostView* parent_host_view, | 505 RenderWidgetHostView* parent_host_view, |
505 const gfx::Rect& bounds_in_screen) { | 506 const gfx::Rect& bounds_in_screen) { |
506 popup_parent_host_view_ = | 507 popup_parent_host_view_ = |
507 static_cast<RenderWidgetHostViewAura*>(parent_host_view); | 508 static_cast<RenderWidgetHostViewAura*>(parent_host_view); |
508 | 509 |
(...skipping 2992 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3501 RenderWidgetHost* widget) { | 3502 RenderWidgetHost* widget) { |
3502 return new RenderWidgetHostViewAura(widget); | 3503 return new RenderWidgetHostViewAura(widget); |
3503 } | 3504 } |
3504 | 3505 |
3505 // static | 3506 // static |
3506 void RenderWidgetHostViewPort::GetDefaultScreenInfo(WebScreenInfo* results) { | 3507 void RenderWidgetHostViewPort::GetDefaultScreenInfo(WebScreenInfo* results) { |
3507 GetScreenInfoForWindow(results, NULL); | 3508 GetScreenInfoForWindow(results, NULL); |
3508 } | 3509 } |
3509 | 3510 |
3510 } // namespace content | 3511 } // namespace content |
OLD | NEW |