Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / mojo / examples / window_manager / debug_panel.cc

diff --git a/src/mojo/examples/window_manager/debug_panel.cc b/src/mojo/examples/window_manager/debug_panel.cc
index 1648d0c..c65785c 100644 (file)
--- a/src/mojo/examples/window_manager/debug_panel.cc
+++ b/src/mojo/examples/window_manager/debug_panel.cc
@@ -35,7 +35,6 @@ DebugPanel::DebugPanel(Delegate* delegate, View* view)
           base::ASCIIToUTF16("Source window"), kNavigationTargetGroupId)),
       navigation_target_default_(new views::RadioButton(
           base::ASCIIToUTF16("Default"), kNavigationTargetGroupId)),
-      next_color_(0),
       colored_square_(new views::BlueButton(
           this, base::ASCIIToUTF16("Local nav test"))),
       close_last_(new views::BlueButton(
@@ -117,9 +116,7 @@ void DebugPanel::Layout(views::View* view) {
 
 void DebugPanel::ButtonPressed(views::Button* sender, const ui::Event& event) {
   if (sender == colored_square_) {
-    Navigate(base::StringPrintf("mojo://mojo_embedded_app/%x",
-                                kColors[next_color_ % arraysize(kColors)]));
-    next_color_++;
+    Navigate("mojo://mojo_embedded_app/");
   } else if (sender == close_last_) {
     delegate_->CloseTopWindow();
   } else if (sender == cross_app_) {
@@ -128,9 +125,9 @@ void DebugPanel::ButtonPressed(views::Button* sender, const ui::Event& event) {
 }
 
 void DebugPanel::Navigate(const std::string& url) {
-  NavigationDetailsPtr details(NavigationDetails::New());
-  details->request->url = url;
-  delegate_->RequestNavigate(view_->id(), TARGET_NEW_NODE, details.Pass());
+  URLRequestPtr request(URLRequest::New());
+  request->url = url;
+  delegate_->RequestNavigate(view_->id(), TARGET_NEW_NODE, request.Pass());
 }
 
 }  // namespace examples