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

Side by Side Diff: Source/bindings/v8/custom/V8InspectorFrontendHostCustom.cpp

Issue 14185003: Use ContextMenu code path that was guarded by CROSS_PLATFORM_CONTEXT_MENU (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Use ContextMenu code path that was guarded by CROSS_PLATFORM_CONTEXT_MENU Created 7 years, 8 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
« no previous file with comments | « Source/WebKit/chromium/src/WebViewImpl.cpp ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2007-2009 Google Inc. All rights reserved. 2 * Copyright (C) 2007-2009 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after
116 116
117 Event* event = V8Event::toNative(eventWrapper); 117 Event* event = V8Event::toNative(eventWrapper);
118 if (!args[1]->IsArray()) 118 if (!args[1]->IsArray())
119 return v8::Undefined(); 119 return v8::Undefined();
120 120
121 v8::Local<v8::Array> array = v8::Local<v8::Array>::Cast(args[1]); 121 v8::Local<v8::Array> array = v8::Local<v8::Array>::Cast(args[1]);
122 ContextMenu menu; 122 ContextMenu menu;
123 populateContextMenuItems(array, menu); 123 populateContextMenuItems(array, menu);
124 124
125 InspectorFrontendHost* frontendHost = V8InspectorFrontendHost::toNative(args .Holder()); 125 InspectorFrontendHost* frontendHost = V8InspectorFrontendHost::toNative(args .Holder());
126 #if !USE(CROSS_PLATFORM_CONTEXT_MENUS)
127 Vector<ContextMenuItem> items = contextMenuItemVector(menu.platformDescripti on());
128 #else
129 Vector<ContextMenuItem> items = menu.items(); 126 Vector<ContextMenuItem> items = menu.items();
130 #endif
131 frontendHost->showContextMenu(event, items); 127 frontendHost->showContextMenu(event, items);
132 128
133 return v8::Undefined(); 129 return v8::Undefined();
134 } 130 }
135 131
136 static v8::Handle<v8::Value> histogramEnumeration(const char* name, const v8::Ar guments& args, int boundaryValue) 132 static v8::Handle<v8::Value> histogramEnumeration(const char* name, const v8::Ar guments& args, int boundaryValue)
137 { 133 {
138 if (args.Length() < 1 || !args[0]->IsInt32()) 134 if (args.Length() < 1 || !args[0]->IsInt32())
139 return v8::Undefined(); 135 return v8::Undefined();
140 136
(...skipping 14 matching lines...) Expand all
155 return histogramEnumeration("DevTools.PanelShown", args, 20); 151 return histogramEnumeration("DevTools.PanelShown", args, 20);
156 } 152 }
157 153
158 v8::Handle<v8::Value> V8InspectorFrontendHost::recordSettingChangedMethodCustom( const v8::Arguments& args) 154 v8::Handle<v8::Value> V8InspectorFrontendHost::recordSettingChangedMethodCustom( const v8::Arguments& args)
159 { 155 {
160 return histogramEnumeration("DevTools.SettingChanged", args, 100); 156 return histogramEnumeration("DevTools.SettingChanged", args, 100);
161 } 157 }
162 158
163 } // namespace WebCore 159 } // namespace WebCore
164 160
OLDNEW
« no previous file with comments | « Source/WebKit/chromium/src/WebViewImpl.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698