| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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/browser/renderer_context_menu/render_view_context_menu.h" | 5 #include "chrome/browser/renderer_context_menu/render_view_context_menu.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 #include <set> | 8 #include <set> |
| 9 #include <utility> | 9 #include <utility> |
| 10 | 10 |
| (...skipping 1829 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1840 base::string16 keyword( | 1840 base::string16 keyword( |
| 1841 TemplateURLService::GenerateKeyword(params_.page_url)); | 1841 TemplateURLService::GenerateKeyword(params_.page_url)); |
| 1842 TemplateURLData data; | 1842 TemplateURLData data; |
| 1843 data.short_name = keyword; | 1843 data.short_name = keyword; |
| 1844 data.SetKeyword(keyword); | 1844 data.SetKeyword(keyword); |
| 1845 data.SetURL(params_.keyword_url.spec()); | 1845 data.SetURL(params_.keyword_url.spec()); |
| 1846 data.favicon_url = | 1846 data.favicon_url = |
| 1847 TemplateURL::GenerateFaviconURL(params_.page_url.GetOrigin()); | 1847 TemplateURL::GenerateFaviconURL(params_.page_url.GetOrigin()); |
| 1848 // Takes ownership of the TemplateURL. | 1848 // Takes ownership of the TemplateURL. |
| 1849 search_engine_tab_helper->delegate()-> | 1849 search_engine_tab_helper->delegate()-> |
| 1850 ConfirmAddSearchProvider(new TemplateURL(profile_, data), profile_); | 1850 ConfirmAddSearchProvider(new TemplateURL(data), profile_); |
| 1851 } | 1851 } |
| 1852 break; | 1852 break; |
| 1853 } | 1853 } |
| 1854 | 1854 |
| 1855 default: | 1855 default: |
| 1856 NOTREACHED(); | 1856 NOTREACHED(); |
| 1857 break; | 1857 break; |
| 1858 } | 1858 } |
| 1859 } | 1859 } |
| 1860 | 1860 |
| (...skipping 133 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1994 source_web_contents_->GetRenderViewHost()-> | 1994 source_web_contents_->GetRenderViewHost()-> |
| 1995 ExecuteMediaPlayerActionAtLocation(location, action); | 1995 ExecuteMediaPlayerActionAtLocation(location, action); |
| 1996 } | 1996 } |
| 1997 | 1997 |
| 1998 void RenderViewContextMenu::PluginActionAt( | 1998 void RenderViewContextMenu::PluginActionAt( |
| 1999 const gfx::Point& location, | 1999 const gfx::Point& location, |
| 2000 const WebPluginAction& action) { | 2000 const WebPluginAction& action) { |
| 2001 source_web_contents_->GetRenderViewHost()-> | 2001 source_web_contents_->GetRenderViewHost()-> |
| 2002 ExecutePluginActionAtLocation(location, action); | 2002 ExecutePluginActionAtLocation(location, action); |
| 2003 } | 2003 } |
| OLD | NEW |