Eliminate use of sim unlock UI notifications

chrome/browser/chromeos/sim_dialog_delegate.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/chromeos/sim_dialog_delegate.h"
 
 #include "base/strings/stringprintf.h"
 #include "chrome/browser/chromeos/login/users/user_manager.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/ui/browser_dialogs.h"
 #include "chrome/common/url_constants.h"
 #include "ui/gfx/size.h"
 
 using content::WebContents;
 using content::WebUIMessageHandler;
 
 namespace {
 
 // Default width/height of the dialog.
 const int kDefaultWidth = 350;
 const int kDefaultHeight = 225;
 
 // Width/height for the change PIN dialog mode.
 const int kChangePinWidth = 350;
 const int kChangePinHeight = 245;
 
-// URL that includes additional mode (other than Unlock flow) that we're using
-// dialog for. Possible values:
-// change-pin   - use dialog to change PIN, ask for old & new PIN.
-// set-lock-on  - enable RequirePin restriction.
-// set-lock-off - disable RequirePin restriction.
-// In general SIM unlock case sim-unlock URL is loaded w/o parameters.
-const char kSimDialogSpecialModeURL[] = "chrome://sim-unlock/?mode=%s";
-
 // Dialog mode constants.
 const char kSimDialogChangePinMode[]  = "change-pin";
 const char kSimDialogSetLockOnMode[]  = "set-lock-on";
 const char kSimDialogSetLockOffMode[] = "set-lock-off";
 
 }  // namespace
 
 namespace chromeos {
 
 // static
@@ skipping 24 matching lines @@
     std::string url_string(chrome::kChromeUISimUnlockURL);
     return GURL(url_string);
   } else {
     std::string mode_value;
     if (dialog_mode_ == SIM_DIALOG_CHANGE_PIN)
       mode_value = kSimDialogChangePinMode;
     else if (dialog_mode_ == SIM_DIALOG_SET_LOCK_ON)
       mode_value = kSimDialogSetLockOnMode;
     else
       mode_value = kSimDialogSetLockOffMode;
-    return GURL(
-        base::StringPrintf(kSimDialogSpecialModeURL, mode_value.c_str()));
+
+    // Create a URL that includes an additional mode (other than Unlock flow).
+    // Possible values for mode are:
+    // change-pin   - use dialog to change PIN, ask for old & new PIN.
+    // set-lock-on  - enable RequirePin restriction.
+    // set-lock-off - disable RequirePin restriction.
+    std::string url_string =
+        std::string(chrome::kChromeUISimUnlockURL) + "?mode=" + mode_value;
+    return GURL(url_string);
   }
 }
 
 void SimDialogDelegate::GetWebUIMessageHandlers(
     std::vector<WebUIMessageHandler*>* handlers) const {
 }
 
 void SimDialogDelegate::GetDialogSize(gfx::Size* size) const {
   // TODO(nkostylev): Set custom size based on locale settings.
   if (dialog_mode_ == SIM_DIALOG_CHANGE_PIN)
@@ skipping 20 matching lines @@
   return false;
 }
 
 bool SimDialogDelegate::HandleContextMenu(
     const content::ContextMenuParams& params) {
   // Disable context menu.
   return true;
 }
 
 }  // namespace chromeos