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

Side by Side Diff: chrome/renderer/render_view.cc

Issue 660408: Revert 39670 which breaks suggestion popup... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 10 years, 9 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 | chrome/renderer/render_widget.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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 "chrome/renderer/render_view.h" 5 #include "chrome/renderer/render_view.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 1547 matching lines...) Expand 10 before | Expand all | Expand 10 after
1558 // the new render view (we don't need the browser to send the URL back down). 1558 // the new render view (we don't need the browser to send the URL back down).
1559 view->alternate_error_page_url_ = alternate_error_page_url_; 1559 view->alternate_error_page_url_ = alternate_error_page_url_;
1560 1560
1561 return view->webview(); 1561 return view->webview();
1562 } 1562 }
1563 1563
1564 WebWidget* RenderView::createPopupMenu(bool activatable) { 1564 WebWidget* RenderView::createPopupMenu(bool activatable) {
1565 RenderWidget* widget = RenderWidget::Create(routing_id_, 1565 RenderWidget* widget = RenderWidget::Create(routing_id_,
1566 render_thread_, 1566 render_thread_,
1567 activatable); 1567 activatable);
1568 showing_popup_menu_ = true;
1569 widget->SetPopupMenuOwnerWidget(this);
1570
1571 return widget->webwidget(); 1568 return widget->webwidget();
1572 } 1569 }
1573 1570
1574 WebWidget* RenderView::createPopupMenu(const WebPopupMenuInfo& info) { 1571 WebWidget* RenderView::createPopupMenu(const WebPopupMenuInfo& info) {
1575 RenderWidget* widget = RenderWidget::Create(routing_id_, 1572 RenderWidget* widget = RenderWidget::Create(routing_id_,
1576 render_thread_, 1573 render_thread_,
1577 true); 1574 true);
1578 showing_popup_menu_ = true;
1579 widget->SetPopupMenuOwnerWidget(this);
1580
1581 widget->ConfigureAsExternalPopupMenu(info); 1575 widget->ConfigureAsExternalPopupMenu(info);
1582 return widget->webwidget(); 1576 return widget->webwidget();
1583 } 1577 }
1584 1578
1585 WebStorageNamespace* RenderView::createSessionStorageNamespace() { 1579 WebStorageNamespace* RenderView::createSessionStorageNamespace() {
1586 if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kSingleProcess)) 1580 if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kSingleProcess))
1587 return WebStorageNamespace::createSessionStorageNamespace(); 1581 return WebStorageNamespace::createSessionStorageNamespace();
1588 CHECK(session_storage_namespace_id_ != kInvalidSessionStorageNamespaceId); 1582 CHECK(session_storage_namespace_id_ != kInvalidSessionStorageNamespaceId);
1589 return new RendererWebStorageNamespaceImpl(DOM_STORAGE_SESSION, 1583 return new RendererWebStorageNamespaceImpl(DOM_STORAGE_SESSION,
1590 session_storage_namespace_id_); 1584 session_storage_namespace_id_);
(...skipping 2983 matching lines...) Expand 10 before | Expand all | Expand 10 after
4574 void RenderView::GPUPluginBuffersSwapped(gfx::PluginWindowHandle window) { 4568 void RenderView::GPUPluginBuffersSwapped(gfx::PluginWindowHandle window) {
4575 Send(new ViewHostMsg_GPUPluginBuffersSwapped(routing_id(), window)); 4569 Send(new ViewHostMsg_GPUPluginBuffersSwapped(routing_id(), window));
4576 } 4570 }
4577 #endif 4571 #endif
4578 4572
4579 WebKit::WebGeolocationServiceInterface* RenderView::getGeolocationService() { 4573 WebKit::WebGeolocationServiceInterface* RenderView::getGeolocationService() {
4580 if (!geolocation_dispatcher_.get()) 4574 if (!geolocation_dispatcher_.get())
4581 geolocation_dispatcher_.reset(new GeolocationDispatcher(this)); 4575 geolocation_dispatcher_.reset(new GeolocationDispatcher(this));
4582 return geolocation_dispatcher_.get(); 4576 return geolocation_dispatcher_.get();
4583 } 4577 }
OLDNEW
« no previous file with comments | « no previous file | chrome/renderer/render_widget.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698