Chromium Code Reviews| Index: mojo/examples/nesting_app/nesting_app.cc |
| diff --git a/mojo/examples/nesting_app/nesting_app.cc b/mojo/examples/nesting_app/nesting_app.cc |
| index 1b015df7840a7aef4beb07b829a9bb1b0bb888bd..3a739dc7e800f0101c96724f6e1c3435e132f871 100644 |
| --- a/mojo/examples/nesting_app/nesting_app.cc |
| +++ b/mojo/examples/nesting_app/nesting_app.cc |
| @@ -38,15 +38,15 @@ const char kEmbeddedAppURL[] = "mojo:mojo_embedded_app"; |
| class NestingApp; |
| -class Navigator : public InterfaceImpl<navigation::Navigator> { |
| +class Navigator : public InterfaceImpl<mojo::Navigator> { |
|
darin (slow to review)
2014/07/25 03:37:29
nit: class NavigatorImpl
|
| public: |
| explicit Navigator(NestingApp* app) : app_(app) {} |
| private: |
| virtual void Navigate( |
| uint32 node_id, |
| - navigation::NavigationDetailsPtr navigation_details, |
| - navigation::ResponseDetailsPtr response_details) OVERRIDE; |
| + NavigationDetailsPtr navigation_details, |
| + ResponseDetailsPtr response_details) OVERRIDE; |
| NestingApp* app_; |
| DISALLOW_COPY_AND_ASSIGN(Navigator); |
| @@ -70,12 +70,10 @@ class NestingApp : public ApplicationDelegate, |
| void NavigateChild() { |
| if (!color_.empty() && nested_) { |
| - navigation::NavigationDetailsPtr details( |
| - navigation::NavigationDetails::New()); |
| + NavigationDetailsPtr details(NavigationDetails::New()); |
| details->url = |
| base::StringPrintf("%s/%s", kEmbeddedAppURL, color_.c_str()); |
| - navigation::ResponseDetailsPtr response_details( |
| - navigation::ResponseDetails::New()); |
| + ResponseDetailsPtr response_details(ResponseDetails::New()); |
| navigator_->Navigate( |
| nested_->id(), details.Pass(), response_details.Pass()); |
| } |
| @@ -130,7 +128,7 @@ class NestingApp : public ApplicationDelegate, |
| std::string color_; |
| Node* nested_; |
| - navigation::NavigatorPtr navigator_; |
| + NavigatorPtr navigator_; |
| IWindowManagerPtr window_manager_; |
| ViewManagerClientFactory view_manager_client_factory_; |
| @@ -138,8 +136,8 @@ class NestingApp : public ApplicationDelegate, |
| }; |
| void Navigator::Navigate(uint32 node_id, |
| - navigation::NavigationDetailsPtr navigation_details, |
| - navigation::ResponseDetailsPtr response_details) { |
| + NavigationDetailsPtr navigation_details, |
| + ResponseDetailsPtr response_details) { |
| GURL url(navigation_details->url.To<std::string>()); |
| if (!url.is_valid()) { |
| LOG(ERROR) << "URL is invalid."; |