| 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/web_contents/web_contents_view_aura.h" | 5 #include "content/browser/web_contents/web_contents_view_aura.h" |
| 6 | 6 |
| 7 #include "base/utf_string_conversions.h" | 7 #include "base/utf_string_conversions.h" |
| 8 #include "content/browser/renderer_host/render_view_host_factory.h" | 8 #include "content/browser/renderer_host/render_view_host_factory.h" |
| 9 #include "content/browser/web_contents/interstitial_page_impl.h" | 9 #include "content/browser/web_contents/interstitial_page_impl.h" |
| 10 #include "content/browser/web_contents/web_contents_impl.h" | 10 #include "content/browser/web_contents/web_contents_impl.h" |
| (...skipping 205 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 216 // WebContentsViewAura, WebContentsView implementation: | 216 // WebContentsViewAura, WebContentsView implementation: |
| 217 | 217 |
| 218 void WebContentsViewAura::CreateView(const gfx::Size& initial_size) { | 218 void WebContentsViewAura::CreateView(const gfx::Size& initial_size) { |
| 219 initial_size_ = initial_size; | 219 initial_size_ = initial_size; |
| 220 | 220 |
| 221 window_.reset(new aura::Window(this)); | 221 window_.reset(new aura::Window(this)); |
| 222 window_->set_owned_by_parent(false); | 222 window_->set_owned_by_parent(false); |
| 223 window_->SetType(aura::client::WINDOW_TYPE_CONTROL); | 223 window_->SetType(aura::client::WINDOW_TYPE_CONTROL); |
| 224 window_->SetTransparent(false); | 224 window_->SetTransparent(false); |
| 225 window_->Init(ui::LAYER_NOT_DRAWN); | 225 window_->Init(ui::LAYER_NOT_DRAWN); |
| 226 #if defined(USE_ASH) | |
| 227 window_->SetParent(NULL); | 226 window_->SetParent(NULL); |
| 228 #endif | |
| 229 window_->layer()->SetMasksToBounds(true); | 227 window_->layer()->SetMasksToBounds(true); |
| 230 window_->SetName("WebContentsViewAura"); | 228 window_->SetName("WebContentsViewAura"); |
| 231 | 229 |
| 232 // delegate_->GetDragDestDelegate() creates a new delegate on every call. | 230 // delegate_->GetDragDestDelegate() creates a new delegate on every call. |
| 233 // Hence, we save a reference to it locally. Similar model is used on other | 231 // Hence, we save a reference to it locally. Similar model is used on other |
| 234 // platforms as well. | 232 // platforms as well. |
| 235 if (delegate_.get()) | 233 if (delegate_.get()) |
| 236 drag_dest_delegate_ = delegate_->GetDragDestDelegate(); | 234 drag_dest_delegate_ = delegate_->GetDragDestDelegate(); |
| 237 } | 235 } |
| 238 | 236 |
| (...skipping 387 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 626 if (current_rvh_for_drag_ != web_contents_->GetRenderViewHost()) | 624 if (current_rvh_for_drag_ != web_contents_->GetRenderViewHost()) |
| 627 OnDragEntered(event); | 625 OnDragEntered(event); |
| 628 | 626 |
| 629 web_contents_->GetRenderViewHost()->DragTargetDrop( | 627 web_contents_->GetRenderViewHost()->DragTargetDrop( |
| 630 event.location(), | 628 event.location(), |
| 631 GetNativeView()->GetRootWindow()->last_mouse_location()); | 629 GetNativeView()->GetRootWindow()->last_mouse_location()); |
| 632 if (drag_dest_delegate_) | 630 if (drag_dest_delegate_) |
| 633 drag_dest_delegate_->OnDrop(); | 631 drag_dest_delegate_->OnDrop(); |
| 634 return current_drag_op_; | 632 return current_drag_op_; |
| 635 } | 633 } |
| OLD | NEW |