diff options
| author | atwilson@chromium.org <atwilson@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-17 16:53:23 +0000 |
|---|---|---|
| committer | atwilson@chromium.org <atwilson@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-17 16:53:23 +0000 |
| commit | c1e0696a17d2683b191ebc9b3b5233260c12c3db (patch) | |
| tree | 376820112fdf45bab0421e47a4455f86b8afd69f /chrome/renderer | |
| parent | 52c45d68387115210e992ddd2538d6ec29917be7 (diff) | |
| download | chromium_src-c1e0696a17d2683b191ebc9b3b5233260c12c3db.zip chromium_src-c1e0696a17d2683b191ebc9b3b5233260c12c3db.tar.gz chromium_src-c1e0696a17d2683b191ebc9b3b5233260c12c3db.tar.bz2 | |
Remove obsolete API handlers now that upstream changes to frame name plumbing have been pushed.
Review URL: http://codereview.chromium.org/2806001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@50114 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/renderer')
| -rwxr-xr-x | chrome/renderer/render_view.cc | 13 | ||||
| -rw-r--r-- | chrome/renderer/render_view.h | 4 |
2 files changed, 2 insertions, 15 deletions
diff --git a/chrome/renderer/render_view.cc b/chrome/renderer/render_view.cc index 7d6b339..a8d5ab2 100755 --- a/chrome/renderer/render_view.cc +++ b/chrome/renderer/render_view.cc @@ -565,9 +565,8 @@ void RenderView::Init(gfx::NativeViewId parent_hwnd, Singleton<ViewMap>::get()->insert(std::make_pair(webview(), this)); webkit_preferences_.Apply(webview()); webview()->initializeMainFrame(this); - // TODO(atwilson): Enable this when setName() becomes available upstream. - // if (!frame_name.empty) - // webview()->mainFrame()->setName(frame_name); + if (!frame_name.empty()) + webview()->mainFrame()->setName(frame_name); webview()->setDevToolsAgent( WebDevToolsAgent::create(webview(), devtools_agent_.get())); @@ -1604,14 +1603,6 @@ void RenderView::OnMissingPluginStatus( // WebKit::WebViewClient ------------------------------------------------------ -// TODO(atwilson): Remove this older API when we've pushed the related changes -// upstream. -WebView* RenderView::createView( - WebFrame* creator, - const WebWindowFeatures& features) { - return createView(creator, features, WebString()); -} - WebView* RenderView::createView( WebFrame* creator, const WebWindowFeatures& features, diff --git a/chrome/renderer/render_view.h b/chrome/renderer/render_view.h index 3d0789e..e98d22c 100644 --- a/chrome/renderer/render_view.h +++ b/chrome/renderer/render_view.h @@ -307,10 +307,6 @@ class RenderView : public RenderWidget, // WebKit::WebViewClient implementation -------------------------------------- - // TODO(atwilson): Remove this API when we push related changes upstream - virtual WebKit::WebView* createView( - WebKit::WebFrame* creator, - const WebKit::WebWindowFeatures& features); virtual WebKit::WebView* createView( WebKit::WebFrame* creator, const WebKit::WebWindowFeatures& features, |