Moving extensions inside chrome/browser/extensions/

chrome/browser/extensions/api/omnibox/omnibox_api.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/extensions/extension_omnibox_api.h"
+#include "chrome/browser/extensions/api/omnibox/omnibox_api.h"
 
 #include "base/json/json_writer.h"
 #include "base/lazy_instance.h"
 #include "base/metrics/histogram.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/extensions/extension_event_router.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/search_engines/template_url.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/webui/ntp/app_launcher_handler.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "content/public/browser/notification_service.h"
 
 namespace events {
 const char kOnInputStarted[] = "omnibox.onInputStarted";
 const char kOnInputChanged[] = "omnibox.onInputChanged";
 const char kOnInputEntered[] = "omnibox.onInputEntered";
 const char kOnInputCancelled[] = "omnibox.onInputCancelled";
-};  // namespace events
+}  // namespace events
 
 namespace {
 const char kDescriptionStylesOrderError[] =
     "Suggestion descriptionStyles must be in increasing non-overlapping order.";
 const char kDescriptionStylesLengthError[] =
     "Suggestion descriptionStyles contains an offset longer than the"
     " description text";
 
 const char kSuggestionContent[] = "content";
 const char kSuggestionDescription[] = "description";
 const char kSuggestionDescriptionStyles[] = "descriptionStyles";
 const char kDescriptionStylesType[] = "type";
 const char kDescriptionStylesOffset[] = "offset";
 const char kDescriptionStylesLength[] = "length";
 
-static base::LazyInstance<base::PropertyAccessor<ExtensionOmniboxSuggestion> >
+static base::LazyInstance<base::PropertyAccessor<
+         extensions::ExtensionOmniboxSuggestion> >
     g_extension_omnibox_suggestion_property_accessor =
         LAZY_INSTANCE_INITIALIZER;
 
-base::PropertyAccessor<ExtensionOmniboxSuggestion>& GetPropertyAccessor() {
+base::PropertyAccessor<extensions::ExtensionOmniboxSuggestion>&
+    GetPropertyAccessor() {
   return g_extension_omnibox_suggestion_property_accessor.Get();
 }
 
 // Returns the suggestion object set by the extension via the
 // omnibox.setDefaultSuggestion call, or NULL if it was never set.
-const ExtensionOmniboxSuggestion* GetDefaultSuggestionForExtension(
+const extensions::ExtensionOmniboxSuggestion* GetDefaultSuggestionForExtension(
     Profile* profile, const std::string& extension_id) {
   const Extension* extension =
       profile->GetExtensionService()->GetExtensionById(extension_id, false);
   if (!extension)
     return NULL;
   return GetPropertyAccessor().GetProperty(
       profile->GetExtensionService()->GetPropertyBag(extension));
 }
 
-};  // namespace
+}  // namespace
+
+namespace extensions {

[Matt Perry, 2012/05/01 01:23:21]

Move this to right after the #include statements. That way you won't have to add
the extensions:: prefix elsewhere.

[vabr (Chromium), 2012/05/01 02:06:50]

Done.

 
 // static
 void ExtensionOmniboxEventRouter::OnInputStarted(
     Profile* profile, const std::string& extension_id) {
   profile->GetExtensionEventRouter()->DispatchEventToExtension(
       extension_id, events::kOnInputStarted, "[]", profile, GURL());
 }
 
 // static
 bool ExtensionOmniboxEventRouter::OnInputChanged(
@@ skipping 213 matching lines @@
 
   // Look at the preferences to find the right launch container.  If no
   // preference is set, launch as a regular tab.
   extension_misc::LaunchContainer launch_container =
       service->extension_prefs()->GetLaunchContainer(
           extension, ExtensionPrefs::LAUNCH_REGULAR);
 
   Browser::OpenApplication(profile, extension, launch_container, GURL(),
                            disposition);
 }
+
+}  // namespace extensions