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

Unified Diff: components/pdf_viewer/pdf_viewer.cc

Issue 1340983002: Mandoline UI Process: Update namespaces and file names (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebased Created 5 years, 3 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
« no previous file with comments | « components/mus/window_manager_access_policy.cc ('k') | components/web_view/frame.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/pdf_viewer/pdf_viewer.cc
diff --git a/components/pdf_viewer/pdf_viewer.cc b/components/pdf_viewer/pdf_viewer.cc
index 9321668ee6d53058908bc3bf430da9390b781fba..270ea40ae750324014d6a587ee6c4d35c3de2384 100644
--- a/components/pdf_viewer/pdf_viewer.cc
+++ b/components/pdf_viewer/pdf_viewer.cc
@@ -58,7 +58,7 @@ void OnGotContentHandlerID(uint32_t content_handler_id) {}
// BitmapUploader is useful if you want to draw a bitmap or color in a View.
class BitmapUploader : public mojo::SurfaceClient {
public:
- explicit BitmapUploader(mojo::View* view)
+ explicit BitmapUploader(mus::View* view)
: view_(view),
color_(g_transparent_color),
width_(0),
@@ -67,8 +67,7 @@ class BitmapUploader : public mojo::SurfaceClient {
next_resource_id_(1u),
id_namespace_(0u),
local_id_(0u),
- returner_binding_(this) {
- }
+ returner_binding_(this) {}
~BitmapUploader() override {
MojoGLES2DestroyContext(gles2_context_);
}
@@ -289,9 +288,9 @@ class BitmapUploader : public mojo::SurfaceClient {
}
}
- mojo::View* view_;
+ mus::View* view_;
mojo::GpuPtr gpu_service_;
- scoped_ptr<mojo::ViewSurface> surface_;
+ scoped_ptr<mus::ViewSurface> surface_;
MojoGLES2Context gles2_context_;
mojo::Size size_;
@@ -311,7 +310,7 @@ class BitmapUploader : public mojo::SurfaceClient {
class EmbedderData {
public:
- EmbedderData(mojo::Shell* shell, mojo::View* root) : bitmap_uploader_(root) {
+ EmbedderData(mojo::Shell* shell, mus::View* root) : bitmap_uploader_(root) {
bitmap_uploader_.Init(shell);
bitmap_uploader_.SetColor(g_background_color);
}
@@ -325,8 +324,8 @@ class EmbedderData {
};
class PDFView : public mojo::ApplicationDelegate,
- public mojo::ViewTreeDelegate,
- public mojo::ViewObserver,
+ public mus::ViewTreeDelegate,
+ public mus::ViewObserver,
public mojo::InterfaceFactory<mojo::ViewTreeClient> {
public:
PDFView(mojo::InterfaceRequest<mojo::Application> request,
@@ -355,7 +354,7 @@ class PDFView : public mojo::ApplicationDelegate,
}
// Overridden from ViewTreeDelegate:
- void OnEmbed(mojo::View* root) override {
+ void OnEmbed(mus::View* root) override {
DCHECK(embedder_for_roots_.find(root) == embedder_for_roots_.end());
root->AddObserver(this);
EmbedderData* embedder_data = new EmbedderData(app_.shell(), root);
@@ -363,18 +362,17 @@ class PDFView : public mojo::ApplicationDelegate,
DrawBitmap(embedder_data);
}
- void OnConnectionLost(mojo::ViewTreeConnection* connection) override {}
+ void OnConnectionLost(mus::ViewTreeConnection* connection) override {}
// Overridden from ViewObserver:
- void OnViewBoundsChanged(mojo::View* view,
+ void OnViewBoundsChanged(mus::View* view,
const mojo::Rect& old_bounds,
const mojo::Rect& new_bounds) override {
DCHECK(embedder_for_roots_.find(view) != embedder_for_roots_.end());
DrawBitmap(embedder_for_roots_[view]);
}
- void OnViewInputEvent(mojo::View* view,
- const mojo::EventPtr& event) override {
+ void OnViewInputEvent(mus::View* view, const mojo::EventPtr& event) override {
DCHECK(embedder_for_roots_.find(view) != embedder_for_roots_.end());
if (event->key_data &&
(event->action != mojo::EVENT_TYPE_KEY_PRESSED ||
@@ -403,7 +401,7 @@ class PDFView : public mojo::ApplicationDelegate,
}
}
- void OnViewDestroyed(mojo::View* view) override {
+ void OnViewDestroyed(mus::View* view) override {
DCHECK(embedder_for_roots_.find(view) != embedder_for_roots_.end());
const auto& it = embedder_for_roots_.find(view);
DCHECK(it != embedder_for_roots_.end());
@@ -417,7 +415,7 @@ class PDFView : public mojo::ApplicationDelegate,
void Create(
mojo::ApplicationConnection* connection,
mojo::InterfaceRequest<mojo::ViewTreeClient> request) override {
- mojo::ViewTreeConnection::Create(this, request.Pass());
+ mus::ViewTreeConnection::Create(this, request.Pass());
}
void DrawBitmap(EmbedderData* embedder_data) {
@@ -466,7 +464,7 @@ class PDFView : public mojo::ApplicationDelegate,
int current_page_;
int page_count_;
FPDF_DOCUMENT doc_;
- std::map<mojo::View*, EmbedderData*> embedder_for_roots_;
+ std::map<mus::View*, EmbedderData*> embedder_for_roots_;
DISALLOW_COPY_AND_ASSIGN(PDFView);
};
« no previous file with comments | « components/mus/window_manager_access_policy.cc ('k') | components/web_view/frame.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698