Manual merge of 60334 - Add a launchApp method to extension management API....

chrome/browser/extensions/extension_function_dispatcher.cc

 // Copyright (c) 2010 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/extensions/extension_function_dispatcher.h"
 
 #include <map>
 
 #include "base/process_util.h"
 #include "base/singleton.h"
@@ skipping 255 matching lines @@
   RegisterFunction<SetTitleSidebarFunction>();
   RegisterFunction<ShowSidebarFunction>();
 
 #if defined(TOOLKIT_VIEWS)
   // Input.
   RegisterFunction<SendKeyboardEventInputFunction>();
 #endif
 
   // Management.
   RegisterFunction<GetAllExtensionsFunction>();
+  RegisterFunction<LaunchAppFunction>();
   RegisterFunction<SetEnabledFunction>();
-  RegisterFunction<InstallFunction>();
   RegisterFunction<UninstallFunction>();
 
   // WebstorePrivate.
   RegisterFunction<GetSyncLoginFunction>();
   RegisterFunction<GetStoreLoginFunction>();
+  RegisterFunction<InstallFunction>();
   RegisterFunction<SetStoreLoginFunction>();
 }
 
 void FactoryRegistry::GetAllNames(std::vector<std::string>* names) {
   for (FactoryMap::iterator iter = factories_.begin();
        iter != factories_.end(); ++iter) {
     names->push_back(iter->first);
   }
 }
 
@@ skipping 197 matching lines @@
   } else {
     NOTREACHED();
     base::KillProcess(render_view_host_->process()->GetHandle(),
                       ResultCodes::KILLED_BAD_MESSAGE, false);
   }
 }
 
 Profile* ExtensionFunctionDispatcher::profile() {
   return profile_;
 }