Merge 232631 "This CL broke the official builders."

chrome/common/extensions/api/commands/commands_handler.h

 // Copyright (c) 2013 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.
 
 #ifndef CHROME_COMMON_EXTENSIONS_API_COMMANDS_COMMANDS_HANDLER_H_
 #define CHROME_COMMON_EXTENSIONS_API_COMMANDS_COMMANDS_HANDLER_H_
 
 #include <string>
 
 #include "base/memory/scoped_ptr.h"
 #include "chrome/common/extensions/command.h"
 #include "chrome/common/extensions/extension.h"
+#include "chrome/common/extensions/manifest_handler.h"
 #include "extensions/common/manifest.h"
-#include "extensions/common/manifest_handler.h"
 
 namespace extensions {
 
 struct CommandsInfo : public Extension::ManifestData {
   CommandsInfo();
   virtual ~CommandsInfo();
 
   // Optional list of commands (keyboard shortcuts).
   // These commands are the commands which the extension wants to use, which are
   // not necessarily the ones it can use, as it might be inactive (see also
@@ skipping 26 matching lines @@
                                     CommandsInfo* info);
 
   virtual const std::vector<std::string> Keys() const OVERRIDE;
 
   DISALLOW_COPY_AND_ASSIGN(CommandsHandler);
 };
 
 }  // namespace extensions
 
 #endif  // CHROME_COMMON_EXTENSIONS_API_COMMANDS_COMMANDS_HANDLER_H_