Merge Chromium at r12.0.742.93: Initial merge by git

Change-Id: Ic5ee2fec31358bbee305f7e915442377bfa6cda6

1 files changed, 0 insertions, 56 deletions

diff --git a/chrome/common/native_web_keyboard_event_mac.mm b/chrome/common/native_web_keyboard_event_mac.mm
deleted file mode 100644
index 1fe53ae..0000000
--- a/chrome/common/native_web_keyboard_event_mac.mm
+++ /dev/null
@@ -1,56 +0,0 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "chrome/common/native_web_keyboard_event.h"
-
-#import <AppKit/AppKit.h>
-
-#include "third_party/WebKit/Source/WebKit/chromium/public/mac/WebInputEventFactory.h"
-
-using WebKit::WebInputEventFactory;
-
-NativeWebKeyboardEvent::NativeWebKeyboardEvent()
-    : os_event(NULL),
-      skip_in_browser(false) {
-}
-
-NativeWebKeyboardEvent::NativeWebKeyboardEvent(NSEvent* event)
-    : WebKeyboardEvent(WebInputEventFactory::keyboardEvent(event)),
-      os_event([event retain]),
-      skip_in_browser(false) {
-}
-
-NativeWebKeyboardEvent::NativeWebKeyboardEvent(wchar_t character,
-                                               int modifiers,
-                                               double time_stamp_seconds)
-    : WebKeyboardEvent(WebInputEventFactory::keyboardEvent(character,
-                                                           modifiers,
-                                                           time_stamp_seconds)),
-      os_event(NULL),
-      skip_in_browser(false) {
-}
-
-NativeWebKeyboardEvent::NativeWebKeyboardEvent(
-    const NativeWebKeyboardEvent& other)
-    : WebKeyboardEvent(other),
-      os_event([other.os_event retain]),
-      skip_in_browser(other.skip_in_browser) {
-}
-
-NativeWebKeyboardEvent& NativeWebKeyboardEvent::operator=(
-    const NativeWebKeyboardEvent& other) {
-  WebKeyboardEvent::operator=(other);
-
-  NSObject* previous = os_event;
-  os_event = [other.os_event retain];
-  [previous release];
-
-  skip_in_browser = other.skip_in_browser;
-
-  return *this;
-}
-
-NativeWebKeyboardEvent::~NativeWebKeyboardEvent() {
-  [os_event release];
-}