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

Unified Diff: content/browser/renderer_host/render_widget_host_view_gtk.cc

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_gtk.cc
===================================================================
--- content/browser/renderer_host/render_widget_host_view_gtk.cc (revision 147462)
+++ content/browser/renderer_host/render_widget_host_view_gtk.cc (working copy)
@@ -52,6 +52,11 @@
#include "webkit/glue/webcursor_gtk_data.h"
#include "webkit/plugins/npapi/webplugin.h"
+using WebKit::WebInputEventFactory;
+using WebKit::WebMouseWheelEvent;
+using WebKit::WebScreenInfo;
+
+namespace content {
namespace {
// Paint rects on Linux are bounded by the maximum size of a shared memory
@@ -104,13 +109,6 @@
} // namespace
-using content::NativeWebKeyboardEvent;
-using content::RenderWidgetHostImpl;
-using content::RenderWidgetHostView;
-using content::RenderWidgetHostViewPort;
-using WebKit::WebInputEventFactory;
-using WebKit::WebMouseWheelEvent;
-
// This class is a simple convenience wrapper for Gtk functions. It has only
// static methods.
class RenderWidgetHostViewGtkWidget {
@@ -567,8 +565,7 @@
DISALLOW_IMPLICIT_CONSTRUCTORS(RenderWidgetHostViewGtkWidget);
};
-RenderWidgetHostViewGtk::RenderWidgetHostViewGtk(
- content::RenderWidgetHost* widget_host)
+RenderWidgetHostViewGtk::RenderWidgetHostViewGtk(RenderWidgetHost* widget_host)
: host_(RenderWidgetHostImpl::From(widget_host)),
about_to_validate_and_paint_(false),
is_hidden_(false),
@@ -693,8 +690,7 @@
DoPopupOrFullscreenInit(window, bounds);
}
-content::RenderWidgetHost*
-RenderWidgetHostViewGtk::GetRenderWidgetHost() const {
+RenderWidgetHost* RenderWidgetHostViewGtk::GetRenderWidgetHost() const {
return host_;
}
@@ -948,7 +944,7 @@
void RenderWidgetHostViewGtk::SelectionChanged(const string16& text,
size_t offset,
const ui::Range& range) {
- content::RenderWidgetHostViewBase::SelectionChanged(text, offset, range);
+ RenderWidgetHostViewBase::SelectionChanged(text, offset, range);
if (text.empty() || range.is_empty())
return;
@@ -1093,7 +1089,7 @@
}
void RenderWidgetHostViewGtk::SetBackground(const SkBitmap& background) {
- content::RenderWidgetHostViewBase::SetBackground(background);
+ RenderWidgetHostViewBase::SetBackground(background);
host_->Send(new ViewMsg_SetBackground(host_->GetRoutingID(), background));
}
@@ -1263,7 +1259,7 @@
gtk_preserve_window_delegate_resize(widget, activated);
}
-void RenderWidgetHostViewGtk::GetScreenInfo(WebKit::WebScreenInfo* results) {
+void RenderWidgetHostViewGtk::GetScreenInfo(WebScreenInfo* results) {
GdkWindow* gdk_window = gtk_widget_get_window(view_.get());
if (!gdk_window) {
GdkDisplay* display = gdk_display_get_default();
@@ -1271,7 +1267,7 @@
}
if (!gdk_window)
return;
- content::GetScreenInfoFromNativeWindow(gdk_window, results);
+ GetScreenInfoFromNativeWindow(gdk_window, results);
}
gfx::Rect RenderWidgetHostViewGtk::GetRootWindowBounds() {
@@ -1476,16 +1472,15 @@
// static
RenderWidgetHostView* RenderWidgetHostView::CreateViewForWidget(
- content::RenderWidgetHost* widget) {
+ RenderWidgetHost* widget) {
return new RenderWidgetHostViewGtk(widget);
}
// static
-void content::RenderWidgetHostViewPort::GetDefaultScreenInfo(
- WebKit::WebScreenInfo* results) {
+void RenderWidgetHostViewPort::GetDefaultScreenInfo(WebScreenInfo* results) {
GdkWindow* gdk_window =
gdk_display_get_default_group(gdk_display_get_default());
- content::GetScreenInfoFromNativeWindow(gdk_window, results);
+ GetScreenInfoFromNativeWindow(gdk_window, results);
}
void RenderWidgetHostViewGtk::SetAccessibilityFocus(int acc_obj_id) {
@@ -1533,7 +1528,7 @@
browser_accessibility_manager_.reset(
BrowserAccessibilityManager::CreateEmptyDocument(
parent,
- static_cast<content::AccessibilityNodeData::State>(0),
+ static_cast<AccessibilityNodeData::State>(0),
this));
}
browser_accessibility_manager_->OnAccessibilityNotifications(params);
@@ -1545,7 +1540,7 @@
browser_accessibility_manager_.reset(
BrowserAccessibilityManager::CreateEmptyDocument(
parent,
- static_cast<content::AccessibilityNodeData::State>(0),
+ static_cast<AccessibilityNodeData::State>(0),
this));
}
BrowserAccessibilityGtk* root =
@@ -1554,3 +1549,5 @@
atk_object_set_role(root->GetAtkObject(), ATK_ROLE_HTML_CONTAINER);
return root->GetAtkObject();
}
+
+} // namespace content

Powered by Google App Engine
This is Rietveld 408576698