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

Side by Side Diff: mojo/services/public/cpp/view_manager/lib/view_manager_client_impl.cc

Issue 418983002: Nukes view_manager namespace (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: resolve merge Created 6 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "mojo/services/public/cpp/view_manager/lib/view_manager_client_impl.h" 5 #include "mojo/services/public/cpp/view_manager/lib/view_manager_client_impl.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/message_loop/message_loop.h" 8 #include "base/message_loop/message_loop.h"
9 #include "mojo/public/cpp/application/application_connection.h" 9 #include "mojo/public/cpp/application/application_connection.h"
10 #include "mojo/public/cpp/application/connect.h" 10 #include "mojo/public/cpp/application/connect.h"
11 #include "mojo/public/interfaces/service_provider/service_provider.mojom.h" 11 #include "mojo/public/interfaces/service_provider/service_provider.mojom.h"
12 #include "mojo/services/public/cpp/view_manager/lib/node_private.h" 12 #include "mojo/services/public/cpp/view_manager/lib/node_private.h"
13 #include "mojo/services/public/cpp/view_manager/lib/view_private.h" 13 #include "mojo/services/public/cpp/view_manager/lib/view_private.h"
14 #include "mojo/services/public/cpp/view_manager/node_observer.h" 14 #include "mojo/services/public/cpp/view_manager/node_observer.h"
15 #include "mojo/services/public/cpp/view_manager/util.h" 15 #include "mojo/services/public/cpp/view_manager/util.h"
16 #include "mojo/services/public/cpp/view_manager/view_manager_delegate.h" 16 #include "mojo/services/public/cpp/view_manager/view_manager_delegate.h"
17 #include "mojo/services/public/cpp/view_manager/view_observer.h" 17 #include "mojo/services/public/cpp/view_manager/view_observer.h"
18 #include "mojo/services/public/cpp/view_manager/window_manager_delegate.h" 18 #include "mojo/services/public/cpp/view_manager/window_manager_delegate.h"
19 #include "third_party/skia/include/core/SkBitmap.h" 19 #include "third_party/skia/include/core/SkBitmap.h"
20 #include "ui/gfx/codec/png_codec.h" 20 #include "ui/gfx/codec/png_codec.h"
21 21
22 namespace mojo { 22 namespace mojo {
23 namespace view_manager {
24 23
25 Id MakeTransportId(ConnectionSpecificId connection_id, 24 Id MakeTransportId(ConnectionSpecificId connection_id,
26 ConnectionSpecificId local_id) { 25 ConnectionSpecificId local_id) {
27 return (connection_id << 16) | local_id; 26 return (connection_id << 16) | local_id;
28 } 27 }
29 28
30 // Helper called to construct a local node/view object from transport data. 29 // Helper called to construct a local node/view object from transport data.
31 Node* AddNodeToViewManager(ViewManagerClientImpl* client, 30 Node* AddNodeToViewManager(ViewManagerClientImpl* client,
32 Node* parent, 31 Node* parent,
33 Id node_id, 32 Id node_id,
(...skipping 436 matching lines...) Expand 10 before | Expand all | Expand 10 after
470 return base::Bind(&ViewManagerClientImpl::OnActionCompleted, 469 return base::Bind(&ViewManagerClientImpl::OnActionCompleted,
471 base::Unretained(this)); 470 base::Unretained(this));
472 } 471 }
473 472
474 base::Callback<void(ErrorCode)> 473 base::Callback<void(ErrorCode)>
475 ViewManagerClientImpl::ActionCompletedCallbackWithErrorCode() { 474 ViewManagerClientImpl::ActionCompletedCallbackWithErrorCode() {
476 return base::Bind(&ViewManagerClientImpl::OnActionCompletedWithErrorCode, 475 return base::Bind(&ViewManagerClientImpl::OnActionCompletedWithErrorCode,
477 base::Unretained(this)); 476 base::Unretained(this));
478 } 477 }
479 478
480 } // namespace view_manager
481 } // namespace mojo 479 } // namespace mojo
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698