| 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/basictypes.h" | 7 #include "base/basictypes.h" |
| 8 #include "base/bind.h" | 8 #include "base/bind.h" |
| 9 #include "base/callback_helpers.h" | 9 #include "base/callback_helpers.h" |
| 10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
| (...skipping 658 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 669 #if defined(OS_WIN) | 669 #if defined(OS_WIN) |
| 670 transient_observer_.reset(new TransientWindowObserver(this)); | 670 transient_observer_.reset(new TransientWindowObserver(this)); |
| 671 #endif | 671 #endif |
| 672 } | 672 } |
| 673 | 673 |
| 674 //////////////////////////////////////////////////////////////////////////////// | 674 //////////////////////////////////////////////////////////////////////////////// |
| 675 // RenderWidgetHostViewAura, RenderWidgetHostView implementation: | 675 // RenderWidgetHostViewAura, RenderWidgetHostView implementation: |
| 676 | 676 |
| 677 void RenderWidgetHostViewAura::InitAsChild( | 677 void RenderWidgetHostViewAura::InitAsChild( |
| 678 gfx::NativeView parent_view) { | 678 gfx::NativeView parent_view) { |
| 679 window_->SetType(aura::client::WINDOW_TYPE_NORMAL); |
| 679 window_->Init(ui::LAYER_TEXTURED); | 680 window_->Init(ui::LAYER_TEXTURED); |
| 680 window_->SetName("RenderWidgetHostViewAura"); | 681 window_->SetName("RenderWidgetHostViewAura"); |
| 681 } | 682 } |
| 682 | 683 |
| 683 void RenderWidgetHostViewAura::InitAsPopup( | 684 void RenderWidgetHostViewAura::InitAsPopup( |
| 684 RenderWidgetHostView* parent_host_view, | 685 RenderWidgetHostView* parent_host_view, |
| 685 const gfx::Rect& bounds_in_screen) { | 686 const gfx::Rect& bounds_in_screen) { |
| 686 popup_parent_host_view_ = | 687 popup_parent_host_view_ = |
| 687 static_cast<RenderWidgetHostViewAura*>(parent_host_view); | 688 static_cast<RenderWidgetHostViewAura*>(parent_host_view); |
| 688 | 689 |
| (...skipping 2580 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3269 RenderWidgetHost* widget) { | 3270 RenderWidgetHost* widget) { |
| 3270 return new RenderWidgetHostViewAura(widget); | 3271 return new RenderWidgetHostViewAura(widget); |
| 3271 } | 3272 } |
| 3272 | 3273 |
| 3273 // static | 3274 // static |
| 3274 void RenderWidgetHostViewPort::GetDefaultScreenInfo(WebScreenInfo* results) { | 3275 void RenderWidgetHostViewPort::GetDefaultScreenInfo(WebScreenInfo* results) { |
| 3275 GetScreenInfoForWindow(results, NULL); | 3276 GetScreenInfoForWindow(results, NULL); |
| 3276 } | 3277 } |
| 3277 | 3278 |
| 3278 } // namespace content | 3279 } // namespace content |
| OLD | NEW |