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

Unified Diff: mojo/examples/media_viewer/media_viewer.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/media_viewer/media_viewer.cc
diff --git a/mojo/examples/media_viewer/media_viewer.cc b/mojo/examples/media_viewer/media_viewer.cc
index 539cbd8e1b4e75fa11c2a6e37d5b6329ed9c74be..784d46737fa16ed90fc02a3c2c42ff5375d03baa 100644
--- a/mojo/examples/media_viewer/media_viewer.cc
+++ b/mojo/examples/media_viewer/media_viewer.cc
@@ -185,17 +185,17 @@ class ControlPanel : public views::ButtonListener {
DISALLOW_COPY_AND_ASSIGN(ControlPanel);
};
-class NavigatorImpl : public InterfaceImpl<navigation::Navigator> {
+class NavigatorImpl : public InterfaceImpl<Navigator> {
public:
explicit NavigatorImpl(MediaViewer* viewer) : viewer_(viewer) {}
virtual ~NavigatorImpl() {}
private:
- // Overridden from navigation::Navigate:
+ // Overridden from Navigator:
virtual void Navigate(
uint32_t node_id,
- navigation::NavigationDetailsPtr navigation_details,
- navigation::ResponseDetailsPtr response_details) OVERRIDE;
+ NavigationDetailsPtr navigation_details,
+ ResponseDetailsPtr response_details) OVERRIDE;
MediaViewer* viewer_;
@@ -228,8 +228,8 @@ class MediaViewer
void Navigate(
uint32_t node_id,
- navigation::NavigationDetailsPtr navigation_details,
- navigation::ResponseDetailsPtr response_details) {
+ NavigationDetailsPtr navigation_details,
+ ResponseDetailsPtr response_details) {
// TODO(yzshen): This shouldn't be needed once FIFO is ready.
if (!view_manager_) {
pending_navigate_request_.reset(new PendingNavigateRequest);
@@ -248,7 +248,7 @@ class MediaViewer
content_node_->Embed(handler);
if (navigation_details) {
- navigation::NavigatorPtr navigator;
+ NavigatorPtr navigator;
app_->ConnectToService(handler, &navigator);
navigator->Navigate(content_node_->id(), navigation_details.Pass(),
response_details.Pass());
@@ -264,8 +264,8 @@ class MediaViewer
struct PendingNavigateRequest {
uint32_t node_id;
- navigation::NavigationDetailsPtr navigation_details;
- navigation::ResponseDetailsPtr response_details;
+ NavigationDetailsPtr navigation_details;
+ ResponseDetailsPtr response_details;
};
@@ -375,8 +375,8 @@ class MediaViewer
void NavigatorImpl::Navigate(
uint32_t node_id,
- navigation::NavigationDetailsPtr navigation_details,
- navigation::ResponseDetailsPtr response_details) {
+ NavigationDetailsPtr navigation_details,
+ ResponseDetailsPtr response_details) {
viewer_->Navigate(node_id, navigation_details.Pass(),
response_details.Pass());
}

Powered by Google App Engine
This is Rietveld 408576698