Index: webkit/tools/test_shell/mac/webwidget_host.mm |
=================================================================== |
--- webkit/tools/test_shell/mac/webwidget_host.mm (revision 90470) |
+++ webkit/tools/test_shell/mac/webwidget_host.mm (working copy) |
@@ -1,4 +1,4 @@ |
-// Copyright (c) 2011 The Chromium Authors. All rights reserved. |
+// Copyright (c) 2008-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. |
@@ -8,12 +8,12 @@ |
#include "base/logging.h" |
#include "skia/ext/platform_canvas.h" |
+#include "third_party/WebKit/Source/WebKit/chromium/public/mac/WebInputEventFactory.h" |
+#include "third_party/WebKit/Source/WebKit/chromium/public/mac/WebScreenInfoFactory.h" |
#include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h" |
#include "third_party/WebKit/Source/WebKit/chromium/public/WebPopupMenu.h" |
#include "third_party/WebKit/Source/WebKit/chromium/public/WebScreenInfo.h" |
#include "third_party/WebKit/Source/WebKit/chromium/public/WebSize.h" |
-#include "third_party/WebKit/Source/WebKit/chromium/public/mac/WebInputEventFactory.h" |
-#include "third_party/WebKit/Source/WebKit/chromium/public/mac/WebScreenInfoFactory.h" |
#include "ui/gfx/rect.h" |
#include "ui/gfx/size.h" |
#include "webkit/glue/webkit_glue.h" |
@@ -30,7 +30,7 @@ |
using WebKit::WebSize; |
using WebKit::WebWidgetClient; |
-// static |
+/*static*/ |
WebWidgetHost* WebWidgetHost::Create(NSView* parent_view, |
WebWidgetClient* client) { |
WebWidgetHost* host = new WebWidgetHost(); |
@@ -41,7 +41,7 @@ |
host->view_ = [[NSView alloc] initWithFrame:content_rect]; |
[parent_view addSubview:host->view_]; |
- // base::win::SetWindowUserData(host->hwnd_, host); |
+ // app::win::SetWindowUserData(host->hwnd_, host); |
host->webwidget_ = WebPopupMenu::create(client); |
host->webwidget_->resize(WebSize(content_rect.size.width, |
@@ -155,7 +155,7 @@ |
} |
WebWidgetHost::~WebWidgetHost() { |
- // base::win::SetWindowUserData(hwnd_, 0); |
+ // app::win::SetWindowUserData(hwnd_, 0); |
webwidget_->close(); |
} |