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

Side by Side Diff: chrome/browser/tab_contents/render_view_context_menu.cc

Issue 8619007: Revert "Move a bunch of ChromeOS APIs out of chrome/browser/extensions." (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 1 month 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 | « chrome/browser/resources/file_manager/js/mock_chrome.js ('k') | chrome/browser/ui/browser.cc » ('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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 <algorithm> 5 #include <algorithm>
6 #include <set> 6 #include <set>
7 #include <utility> 7 #include <utility>
8 8
9 #include "chrome/browser/tab_contents/render_view_context_menu.h" 9 #include "chrome/browser/tab_contents/render_view_context_menu.h"
10 10
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
71 #include "net/base/escape.h" 71 #include "net/base/escape.h"
72 #include "net/base/net_util.h" 72 #include "net/base/net_util.h"
73 #include "third_party/WebKit/Source/WebKit/chromium/public/WebContextMenuData.h" 73 #include "third_party/WebKit/Source/WebKit/chromium/public/WebContextMenuData.h"
74 #include "third_party/WebKit/Source/WebKit/chromium/public/WebMediaPlayerAction. h" 74 #include "third_party/WebKit/Source/WebKit/chromium/public/WebMediaPlayerAction. h"
75 #include "ui/base/l10n/l10n_util.h" 75 #include "ui/base/l10n/l10n_util.h"
76 #include "ui/base/text/text_elider.h" 76 #include "ui/base/text/text_elider.h"
77 #include "ui/gfx/favicon_size.h" 77 #include "ui/gfx/favicon_size.h"
78 #include "webkit/glue/webmenuitem.h" 78 #include "webkit/glue/webmenuitem.h"
79 79
80 #ifdef FILE_MANAGER_EXTENSION 80 #ifdef FILE_MANAGER_EXTENSION
81 #include "chrome/browser/chromeos/extensions/file_manager_util.h" 81 #include "chrome/browser/extensions/file_manager_util.h"
82 #endif 82 #endif
83 83
84 using WebKit::WebContextMenuData; 84 using WebKit::WebContextMenuData;
85 using WebKit::WebMediaPlayerAction; 85 using WebKit::WebMediaPlayerAction;
86 using WebKit::WebURL; 86 using WebKit::WebURL;
87 using WebKit::WebString; 87 using WebKit::WebString;
88 88
89 namespace { 89 namespace {
90 90
91 // Usually a new tab is expected where this function is used, 91 // Usually a new tab is expected where this function is used,
(...skipping 1773 matching lines...) Expand 10 before | Expand all | Expand 10 after
1865 profile_->GetPrefs()->GetString(prefs::kAcceptLanguages), 1865 profile_->GetPrefs()->GetString(prefs::kAcceptLanguages),
1866 g_browser_process->clipboard()); 1866 g_browser_process->clipboard());
1867 } 1867 }
1868 1868
1869 void RenderViewContextMenu::MediaPlayerActionAt( 1869 void RenderViewContextMenu::MediaPlayerActionAt(
1870 const gfx::Point& location, 1870 const gfx::Point& location,
1871 const WebMediaPlayerAction& action) { 1871 const WebMediaPlayerAction& action) {
1872 source_tab_contents_->render_view_host()-> 1872 source_tab_contents_->render_view_host()->
1873 ExecuteMediaPlayerActionAtLocation(location, action); 1873 ExecuteMediaPlayerActionAtLocation(location, action);
1874 } 1874 }
OLDNEW
« no previous file with comments | « chrome/browser/resources/file_manager/js/mock_chrome.js ('k') | chrome/browser/ui/browser.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698