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

Unified Diff: content/browser/renderer_host/render_widget_host_view_mac.mm

Issue 10804031: Move more files into the content namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 5 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 side-by-side diff with in-line comments
Download patch
Index: content/browser/renderer_host/render_widget_host_view_mac.mm
===================================================================
--- content/browser/renderer_host/render_widget_host_view_mac.mm (revision 147462)
+++ content/browser/renderer_host/render_widget_host_view_mac.mm (working copy)
@@ -53,12 +53,12 @@
#include "ui/surface/io_surface_support_mac.h"
#include "webkit/plugins/npapi/webplugin.h"
-using content::BrowserThread;
+using content::BackingStoreMac;
using content::NativeWebKeyboardEvent;
using content::RenderViewHostImpl;
-using content::RenderWidgetHost;
using content::RenderWidgetHostImpl;
-using content::RenderWidgetHostView;
+using content::RenderWidgetHostViewMac;
+using content::RenderWidgetHostViewMacEditCommandHelper;
using WebKit::WebInputEvent;
using WebKit::WebInputEventFactory;
using WebKit::WebMouseEvent;
@@ -109,7 +109,7 @@
return modifiers;
}
-float ScaleFactor(NSView* view) {
+static float ScaleFactor(NSView* view) {
if (NSWindow* window = [view window]) {
if ([window respondsToSelector:@selector(backingScaleFactor)])
return [window backingScaleFactor];
@@ -163,7 +163,6 @@
@end
-
namespace {
// Maximum number of characters we allow in a tooltip.
@@ -262,6 +261,8 @@
} // namespace
+namespace content {
+
///////////////////////////////////////////////////////////////////////////////
// RenderWidgetHostView, public:
@@ -272,7 +273,7 @@
}
// static
-void content::RenderWidgetHostViewPort::GetDefaultScreenInfo(
+void RenderWidgetHostViewPort::GetDefaultScreenInfo(
WebKit::WebScreenInfo* results) {
*results = WebKit::WebScreenInfoFactory::screenInfo(NULL);
}
@@ -772,7 +773,7 @@
}
void RenderWidgetHostViewMac::SetShowingContextMenu(bool showing) {
- content::RenderWidgetHostViewBase::SetShowingContextMenu(showing);
+ RenderWidgetHostViewBase::SetShowingContextMenu(showing);
// Create a fake mouse event to inform the render widget that the mouse
// left or entered.
@@ -1263,7 +1264,7 @@
}
void RenderWidgetHostViewMac::SetBackground(const SkBitmap& background) {
- content::RenderWidgetHostViewBase::SetBackground(background);
+ RenderWidgetHostViewBase::SetBackground(background);
if (render_widget_host_)
render_widget_host_->Send(new ViewMsg_SetBackground(
render_widget_host_->GetRoutingID(), background));
@@ -1275,7 +1276,7 @@
SetBrowserAccessibilityManager(
BrowserAccessibilityManager::CreateEmptyDocument(
cocoa_view_,
- static_cast<content::AccessibilityNodeData::State>(0),
+ static_cast<AccessibilityNodeData::State>(0),
NULL));
}
GetBrowserAccessibilityManager()->OnAccessibilityNotifications(params);
@@ -1293,6 +1294,8 @@
}
}
+} // namespace content
+
// RenderWidgetHostViewCocoa ---------------------------------------------------
@implementation RenderWidgetHostViewCocoa

Powered by Google App Engine
This is Rietveld 408576698