Moving extensions inside chrome/browser/extensions/

chrome/browser/extensions/api/omnibox/omnibox_api.cc

Index: chrome/browser/extensions/api/omnibox/omnibox_api.cc
diff --git a/chrome/browser/extensions/extension_omnibox_api.cc b/chrome/browser/extensions/api/omnibox/omnibox_api.cc
similarity index 96%
rename from chrome/browser/extensions/extension_omnibox_api.cc
rename to chrome/browser/extensions/api/omnibox/omnibox_api.cc
index a83e57707820e967336de7d5a8324590b2567b19..c6c8bfd8b09d38c7ebab1d4881a5170b467daedc 100644
--- a/chrome/browser/extensions/extension_omnibox_api.cc
+++ b/chrome/browser/extensions/api/omnibox/omnibox_api.cc
@@ -2,7 +2,7 @@
 // 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"
@@ -25,7 +25,7 @@ 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[] =
@@ -41,17 +41,19 @@ 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);
@@ -61,7 +63,9 @@ const ExtensionOmniboxSuggestion* GetDefaultSuggestionForExtension(
       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(
@@ -295,3 +299,5 @@ void LaunchAppFromOmnibox(const AutocompleteMatch& match,
   Browser::OpenApplication(profile, extension, launch_container, GURL(),
                            disposition);
 }
+
+}  // namespace extensions