Move declarative_webrequest: action, rules_registry

chrome/browser/chromeos/input_method/input_method_util.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/chromeos/input_method/input_method_util.h"
 
 #include <algorithm>
 #include <functional>
 #include <map>
 #include <utility>
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
-#include "chrome/common/extensions/extension_constants.h"
 // TODO(nona): move this header from this file.
 #include "chrome/grit/generated_resources.h"
 #include "chromeos/ime/component_extension_ime_manager.h"
 #include "chromeos/ime/extension_ime_util.h"
 // For SetHardwareKeyboardLayoutForTesting.
+#include "chrome/common/extensions/extension_constants.h"

[Daniel Erat, 2014/09/16 17:42:10]

i don't understand why this header got moved down in the list; it's no longer
sorted correctly. is the "For SetHardwareKeyboardLayoutForTesting" comment meant
to apply to this file? the header seems to be used for other things, like
extension_misc::kBrailleImeExtensionId

[wjmaclean, 2014/09/16 17:51:59]

Sorry, this got out of order when I moved extension_constants.* back, and I had
to bypass hooks when I uploaded this CL so I missed it.

Done.

 #include "chromeos/ime/fake_input_method_delegate.h"
 #include "chromeos/ime/input_method_delegate.h"
 #include "chromeos/ime/input_method_whitelist.h"
 
 namespace {
 
 // A mapping from an input method id to a string for the language indicator. The
 // mapping is necessary since some input methods belong to the same language.
 // For example, both "xkb:us::eng" and "xkb:us:dvorak:eng" are for US English.
 const struct {
@@ skipping 718 matching lines @@
       "US",
       layouts,
       languages,
       true,  // login keyboard.
       GURL(),  // options page, not available.
       GURL()); // input view page, not available.
 }
 
 }  // namespace input_method
 }  // namespace chromeos