| 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/renderer/render_widget.h" | 5 #include "content/renderer/render_widget.h" |
| 6 | 6 |
| 7 #include "base/auto_reset.h" | 7 #include "base/auto_reset.h" |
| 8 #include "base/bind.h" | 8 #include "base/bind.h" |
| 9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
| 10 #include "base/debug/trace_event.h" | 10 #include "base/debug/trace_event.h" |
| (...skipping 519 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 530 return widget.get(); | 530 return widget.get(); |
| 531 } | 531 } |
| 532 return NULL; | 532 return NULL; |
| 533 } | 533 } |
| 534 | 534 |
| 535 // static | 535 // static |
| 536 WebWidget* RenderWidget::CreateWebWidget(RenderWidget* render_widget) { | 536 WebWidget* RenderWidget::CreateWebWidget(RenderWidget* render_widget) { |
| 537 switch (render_widget->popup_type_) { | 537 switch (render_widget->popup_type_) { |
| 538 case blink::WebPopupTypeNone: // Nothing to create. | 538 case blink::WebPopupTypeNone: // Nothing to create. |
| 539 break; | 539 break; |
| 540 case blink::WebPopupTypeSelect: | |
| 541 case blink::WebPopupTypeSuggestion: | |
| 542 return WebPopupMenu::create(render_widget); | |
| 543 case blink::WebPopupTypePage: | 540 case blink::WebPopupTypePage: |
| 544 return WebPagePopup::create(render_widget); | 541 return WebPagePopup::create(render_widget); |
| 545 default: | 542 default: |
| 546 NOTREACHED(); | 543 NOTREACHED(); |
| 547 } | 544 } |
| 548 return NULL; | 545 return NULL; |
| 549 } | 546 } |
| 550 | 547 |
| 551 bool RenderWidget::Init(int32 opener_id) { | 548 bool RenderWidget::Init(int32 opener_id) { |
| 552 return DoInit(opener_id, | 549 return DoInit(opener_id, |
| (...skipping 1785 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2338 void RenderWidget::RegisterVideoHoleFrame(RenderFrameImpl* frame) { | 2335 void RenderWidget::RegisterVideoHoleFrame(RenderFrameImpl* frame) { |
| 2339 video_hole_frames_.AddObserver(frame); | 2336 video_hole_frames_.AddObserver(frame); |
| 2340 } | 2337 } |
| 2341 | 2338 |
| 2342 void RenderWidget::UnregisterVideoHoleFrame(RenderFrameImpl* frame) { | 2339 void RenderWidget::UnregisterVideoHoleFrame(RenderFrameImpl* frame) { |
| 2343 video_hole_frames_.RemoveObserver(frame); | 2340 video_hole_frames_.RemoveObserver(frame); |
| 2344 } | 2341 } |
| 2345 #endif // defined(VIDEO_HOLE) | 2342 #endif // defined(VIDEO_HOLE) |
| 2346 | 2343 |
| 2347 } // namespace content | 2344 } // namespace content |
| OLD | NEW |