Conflict detection for Extension Keybinding.

chrome/browser/extensions/extension_command_service_factory.cc

Index: chrome/browser/extensions/extension_command_service_factory.cc
===================================================================
--- chrome/browser/extensions/extension_command_service_factory.cc	(revision 0)
+++ chrome/browser/extensions/extension_command_service_factory.cc	(revision 0)
@@ -0,0 +1,41 @@
+// 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/extensions/extension_command_service_factory.h"
+
+#include "chrome/browser/profiles/profile_dependency_manager.h"
+#include "chrome/browser/extensions/extension_command_service.h"
+
+// static
+ExtensionCommandService* ExtensionCommandServiceFactory::GetForProfile(
+    Profile* profile) {
+  return static_cast<ExtensionCommandService*>(
+      GetInstance()->GetServiceForProfile(profile, true));
+}
+
+// static
+ExtensionCommandServiceFactory* ExtensionCommandServiceFactory::GetInstance() {
+  return Singleton<ExtensionCommandServiceFactory>::get();
+}
+
+bool ExtensionCommandServiceFactory::ServiceIsCreatedWithProfile() {
+  return true;
+}

[Finnur, 2012/04/30 09:28:37]

Thanks for the tip, Yoyo.

This change means there are no changes remaining for
extension_keybinding_registry.cc, so it was removed from the CL.

+
+ExtensionCommandServiceFactory::ExtensionCommandServiceFactory()
+    : ProfileKeyedServiceFactory("ExtensionCommandService",
+                                 ProfileDependencyManager::GetInstance()) {

[Yoyo Zhou, 2012/05/01 01:51:30]

DependsOn would go here.

+}
+
+ExtensionCommandServiceFactory::~ExtensionCommandServiceFactory() {
+}
+
+ProfileKeyedService* ExtensionCommandServiceFactory::BuildServiceInstanceFor(
+    Profile* profile) const {
+  return new ExtensionCommandService(profile);
+}
+
+bool ExtensionCommandServiceFactory::ServiceRedirectedInIncognito() {
+  return true;
+}
Property changes on: chrome\browser\extensions\extension_command_service_factory.cc
___________________________________________________________________
Added: svn:eol-style
   + LF