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

Unified Diff: mojo/examples/embedded_app/embedded_app.cc

Issue 413353002: Remove extraneous namespaces (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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 side-by-side diff with in-line comments
Download patch
Index: mojo/examples/embedded_app/embedded_app.cc
diff --git a/mojo/examples/embedded_app/embedded_app.cc b/mojo/examples/embedded_app/embedded_app.cc
index 7e555cd2be62fee79b1a495563d0f7b0bfa0e500..edd895272498410a65548ec892a86f360bd2ac4a 100644
--- a/mojo/examples/embedded_app/embedded_app.cc
+++ b/mojo/examples/embedded_app/embedded_app.cc
@@ -35,15 +35,15 @@ namespace mojo {
namespace examples {
class EmbeddedApp;
-class Navigator : public InterfaceImpl<navigation::Navigator> {
+class Navigator : public InterfaceImpl<mojo::Navigator> {
darin (slow to review) 2014/07/25 03:37:29 nit: this class should really be named NavigatorIm
public:
explicit Navigator(EmbeddedApp* 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;
EmbeddedApp* app_;
DISALLOW_COPY_AND_ASSIGN(Navigator);
@@ -103,11 +103,10 @@ class EmbeddedApp : public ApplicationDelegate,
virtual void OnViewInputEvent(View* view, const EventPtr& event) OVERRIDE {
if (event->action == EVENT_TYPE_MOUSE_RELEASED) {
if (event->flags & EVENT_FLAGS_LEFT_MOUSE_BUTTON) {
- navigation::NavigationDetailsPtr nav_details(
- navigation::NavigationDetails::New());
+ NavigationDetailsPtr nav_details(NavigationDetails::New());
nav_details->url = "http://www.aaronboodman.com/z_dropbox/test.html";
navigator_host_->RequestNavigate(view->node()->id(),
- navigation::TARGET_SOURCE_NODE,
+ TARGET_SOURCE_NODE,
nav_details.Pass());
}
}
@@ -142,7 +141,7 @@ class EmbeddedApp : public ApplicationDelegate,
}
view_manager::ViewManager* view_manager_;
- navigation::NavigatorHostPtr navigator_host_;
+ NavigatorHostPtr navigator_host_;
std::map<Node*, View*> views_to_reap_;
ViewManagerClientFactory view_manager_client_factory_;
@@ -157,8 +156,8 @@ class EmbeddedApp : 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.";

Powered by Google App Engine
This is Rietveld 408576698