diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-17 16:09:19 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-17 16:09:19 +0000 |
| commit | 80b36533b7985789b606b8c4278dc0674c72e188 (patch) | |
| tree | 482c19e80f50867019aef4a242d5b45b84d5f461 /mojo/examples/image_viewer/image_viewer.cc | |
| parent | 4851dd2968902ea74086c1e3bb10a17713c7d7ab (diff) | |
| download | chromium_src-80b36533b7985789b606b8c4278dc0674c72e188.zip chromium_src-80b36533b7985789b606b8c4278dc0674c72e188.tar.gz chromium_src-80b36533b7985789b606b8c4278dc0674c72e188.tar.bz2 | |
Client side name cleanup
ViewTreeNode*->Node*
ViewManagerSynchcronizer->ViewManagerClientImpl
R=sky@chromium.org
TBR=sky@chromium.org
http://crbug.com/384443
Review URL: https://codereview.chromium.org/338093008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@277775 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'mojo/examples/image_viewer/image_viewer.cc')
| -rw-r--r-- | mojo/examples/image_viewer/image_viewer.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mojo/examples/image_viewer/image_viewer.cc b/mojo/examples/image_viewer/image_viewer.cc index 73c4c12..51afd8f 100644 --- a/mojo/examples/image_viewer/image_viewer.cc +++ b/mojo/examples/image_viewer/image_viewer.cc @@ -6,11 +6,11 @@ #include "base/strings/string_tokenizer.h" #include "mojo/public/cpp/application/application.h" +#include "mojo/services/public/cpp/view_manager/node.h" +#include "mojo/services/public/cpp/view_manager/types.h" #include "mojo/services/public/cpp/view_manager/view.h" #include "mojo/services/public/cpp/view_manager/view_manager.h" #include "mojo/services/public/cpp/view_manager/view_manager_delegate.h" -#include "mojo/services/public/cpp/view_manager/view_manager_types.h" -#include "mojo/services/public/cpp/view_manager/view_tree_node.h" #include "mojo/services/public/interfaces/launcher/launcher.mojom.h" #include "third_party/skia/include/core/SkBitmap.h" #include "ui/gfx/codec/png_codec.h" @@ -103,7 +103,7 @@ class ImageViewer : public Application, // Overridden from view_manager::ViewManagerDelegate: virtual void OnRootAdded(view_manager::ViewManager* view_manager, - view_manager::ViewTreeNode* root) OVERRIDE { + view_manager::Node* root) OVERRIDE { content_view_ = view_manager::View::Create(view_manager); root->SetActiveView(content_view_); content_view_->SetColor(SK_ColorRED); |