Fix the blocked pluigin infobar for metro mode

chrome/browser/ui/browser_command_controller.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/ui/browser_command_controller.h"
 
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/defaults.h"
 #include "chrome/browser/extensions/extension_service.h"
@@ skipping 50 matching lines @@
     return true;
 
   // If the |virtual_url()| isn't a chrome:// URL, check if it's actually
   // view-source: of a chrome:// URL.
   if (entry->GetVirtualURL().SchemeIs(chrome::kViewSourceScheme))
     return entry->GetURL().SchemeIs(chrome::kChromeUIScheme);
 
   return false;
 }
 
-#if defined(OS_WIN)
-void RestartWithModeSwitch() {
-  PrefService* prefs = g_browser_process->local_state();
-  if (!prefs)
-    return;
-  if (!prefs->HasPrefPath(prefs::kRestartSwitchMode))
-    return;
-  prefs->SetBoolean(prefs::kRestartSwitchMode, true);
-  browser::AttemptRestart();
-}
-#endif
-
 }  // namespace
 
 namespace chrome {
 
 ///////////////////////////////////////////////////////////////////////////////
 // BrowserCommandController, public:
 
 BrowserCommandController::BrowserCommandController(Browser* browser)
     : browser_(browser),
       ALLOW_THIS_IN_INITIALIZER_LIST(command_updater_(this)),
@@ skipping 252 matching lines @@
 
 #if defined(OS_WIN)
     // Windows 8 specific commands.
     case IDC_METRO_SNAP_ENABLE:
       browser_->SetMetroSnapMode(true);
       break;
     case IDC_METRO_SNAP_DISABLE:
       browser_->SetMetroSnapMode(false);
       break;
     case IDC_WIN8_DESKTOP_RESTART:
-      RestartWithModeSwitch();
-      break;
     case IDC_WIN8_METRO_RESTART:
-      RestartWithModeSwitch();
+      browser::AttemptRestartWithModeSwitch();
       break;
 #endif
 
 #if defined(OS_MACOSX)
     case IDC_PRESENTATION_MODE:
       browser_->TogglePresentationMode();
       break;
 #endif
     case IDC_EXIT:
       Exit();
@@ skipping 733 matching lines @@
 
 BrowserWindow* BrowserCommandController::window() {
   return browser_->window();
 }
 
 Profile* BrowserCommandController::profile() {
   return browser_->profile();
 }
 
 }  // namespace chrome