diff options
author | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-07 18:47:20 +0000 |
---|---|---|
committer | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-07 18:47:20 +0000 |
commit | 4159e7f4840e961b69e4f9438a5858d0b3fe6e63 (patch) | |
tree | 014e23d7e937a99e6e9d98ca005622f8dfbe9935 /content/child | |
parent | 2cc986c47746f59aad961b0791fd1620ff599d70 (diff) | |
download | chromium_src-4159e7f4840e961b69e4f9438a5858d0b3fe6e63.zip chromium_src-4159e7f4840e961b69e4f9438a5858d0b3fe6e63.tar.gz chromium_src-4159e7f4840e961b69e4f9438a5858d0b3fe6e63.tar.bz2 |
mac: Prepare for -Wunused-functions.
Mostly involves deleting hundreds of lines of unused code.
BUG=315884
R=akalin@chromium.org, brettw@chromium.org, fischman@chromium.org, jamesr@chromium.org, sky@chromium.org, thestig@chromium.org
TBR=piman, youngki
Review URL: https://codereview.chromium.org/63153003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@233646 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/child')
-rw-r--r-- | content/child/indexed_db/indexed_db_dispatcher.cc | 3 | ||||
-rw-r--r-- | content/child/npapi/plugin_instance_mac.mm | 50 | ||||
-rw-r--r-- | content/child/site_isolation_policy.cc | 15 |
3 files changed, 0 insertions, 68 deletions
diff --git a/content/child/indexed_db/indexed_db_dispatcher.cc b/content/child/indexed_db/indexed_db_dispatcher.cc index b453f50..fe9554a 100644 --- a/content/child/indexed_db/indexed_db_dispatcher.cc +++ b/content/child/indexed_db/indexed_db_dispatcher.cc @@ -39,9 +39,6 @@ namespace { IndexedDBDispatcher* const kHasBeenDeleted = reinterpret_cast<IndexedDBDispatcher*>(0x1); -int32 CurrentWorkerId() { - return WorkerTaskRunner::Instance()->CurrentWorkerId(); -} } // unnamed namespace const size_t kMaxIDBValueSizeInBytes = 64 * 1024 * 1024; diff --git a/content/child/npapi/plugin_instance_mac.mm b/content/child/npapi/plugin_instance_mac.mm index 5453f8f..bc8edb2 100644 --- a/content/child/npapi/plugin_instance_mac.mm +++ b/content/child/npapi/plugin_instance_mac.mm @@ -19,56 +19,6 @@ namespace content { -namespace { - -// Returns an autoreleased NSEvent constructed from the given np_event, -// targeting the given window. -NSEvent* NSEventForNPCocoaEvent(NPCocoaEvent* np_event, NSWindow* window) { - bool mouse_down = 1; - switch (np_event->type) { - case NPCocoaEventMouseDown: - mouse_down = 1; - break; - case NPCocoaEventMouseUp: - mouse_down = 0; - break; - default: - // If plugins start bringing up context menus for things other than - // clicks, this will need more plumbing; for now just log it and proceed - // as if it were a mouse down. - NOTREACHED(); - } - NSEventType event_type = NSLeftMouseDown; - switch (np_event->data.mouse.buttonNumber) { - case 0: - event_type = mouse_down ? NSLeftMouseDown : NSLeftMouseUp; - break; - case 1: - event_type = mouse_down ? NSRightMouseDown : NSRightMouseUp; - break; - default: - event_type = mouse_down ? NSOtherMouseDown : NSOtherMouseUp; - break; - } - - NSInteger click_count = np_event->data.mouse.clickCount; - NSInteger modifiers = np_event->data.mouse.modifierFlags; - // NPCocoaEvent doesn't have a timestamp, so just use the current time. - NSEvent* event = - [NSEvent mouseEventWithType:event_type - location:NSZeroPoint - modifierFlags:modifiers - timestamp:[[NSApp currentEvent] timestamp] - windowNumber:[window windowNumber] - context:[NSGraphicsContext currentContext] - eventNumber:0 - clickCount:click_count - pressure:1.0]; - return event; -} - -} // namespace - NPError PluginInstance::PopUpContextMenu(NPMenu* menu) { if (!currently_handled_event_) return NPERR_GENERIC_ERROR; diff --git a/content/child/site_isolation_policy.cc b/content/child/site_isolation_policy.cc index a761a06..e98d744 100644 --- a/content/child/site_isolation_policy.cc +++ b/content/child/site_isolation_policy.cc @@ -158,21 +158,6 @@ void HistogramCountNotBlockedResponse(const std::string& bucket_prefix, IncrementHistogramCount(bucket_prefix + ".NotBlocked.MaybeJS"); } -void HistogramCountPolicyDecision( - const std::string& bucket_prefix, - bool sniffed_as_document, - bool sniffed_as_js, - const SiteIsolationPolicy::ResponseMetaData& resp_data) { - if (sniffed_as_document) { - HistogramCountBlockedResponse(bucket_prefix, resp_data, false); - } else { - if (resp_data.no_sniff) - HistogramCountBlockedResponse(bucket_prefix, resp_data, true); - else - HistogramCountNotBlockedResponse(bucket_prefix, sniffed_as_js); - } -} - } // namespace SiteIsolationPolicy::ResponseMetaData::ResponseMetaData() {} |