Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(550)

Side by Side Diff: chrome/browser/ui/webui/options/chromeos/cros_language_options_handler.cc

Issue 498773003: Use a qualified path for chromium_strings, google_chrome_strings, and generated_resources. (part 2 … (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/ui/webui/options/chromeos/cros_language_options_handler .h" 5 #include "chrome/browser/ui/webui/options/chromeos/cros_language_options_handler .h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/bind_helpers.h" 8 #include "base/bind_helpers.h"
9 #include "base/strings/stringprintf.h" 9 #include "base/strings/stringprintf.h"
10 #include "base/strings/utf_string_conversions.h" 10 #include "base/strings/utf_string_conversions.h"
11 #include "base/values.h" 11 #include "base/values.h"
12 #include "chrome/app/chrome_command_ids.h" 12 #include "chrome/app/chrome_command_ids.h"
13 #include "chrome/browser/chromeos/input_method/input_method_util.h" 13 #include "chrome/browser/chromeos/input_method/input_method_util.h"
14 #include "chrome/browser/chromeos/profiles/profile_helper.h" 14 #include "chrome/browser/chromeos/profiles/profile_helper.h"
15 #include "chrome/browser/extensions/extension_tab_util.h" 15 #include "chrome/browser/extensions/extension_tab_util.h"
16 #include "chrome/browser/lifetime/application_lifetime.h" 16 #include "chrome/browser/lifetime/application_lifetime.h"
17 #include "chrome/browser/profiles/profile.h" 17 #include "chrome/browser/profiles/profile.h"
18 #include "chrome/browser/ui/browser.h" 18 #include "chrome/browser/ui/browser.h"
19 #include "chrome/browser/ui/browser_finder.h" 19 #include "chrome/browser/ui/browser_finder.h"
20 #include "chrome/browser/ui/browser_window.h" 20 #include "chrome/browser/ui/browser_window.h"
21 #include "chrome/browser/ui/tabs/tab_strip_model.h" 21 #include "chrome/browser/ui/tabs/tab_strip_model.h"
22 #include "chrome/browser/ui/webui/chromeos/login/l10n_util.h" 22 #include "chrome/browser/ui/webui/chromeos/login/l10n_util.h"
23 #include "chrome/common/extensions/manifest_url_handler.h" 23 #include "chrome/common/extensions/manifest_url_handler.h"
24 #include "chrome/grit/chromium_strings.h"
25 #include "chrome/grit/generated_resources.h"
24 #include "chromeos/ime/component_extension_ime_manager.h" 26 #include "chromeos/ime/component_extension_ime_manager.h"
25 #include "chromeos/ime/extension_ime_util.h" 27 #include "chromeos/ime/extension_ime_util.h"
26 #include "chromeos/ime/input_method_manager.h" 28 #include "chromeos/ime/input_method_manager.h"
27 #include "components/user_manager/user_manager.h" 29 #include "components/user_manager/user_manager.h"
28 #include "components/user_manager/user_type.h" 30 #include "components/user_manager/user_type.h"
29 #include "content/public/browser/navigation_controller.h" 31 #include "content/public/browser/navigation_controller.h"
30 #include "content/public/browser/user_metrics.h" 32 #include "content/public/browser/user_metrics.h"
31 #include "content/public/browser/web_contents.h" 33 #include "content/public/browser/web_contents.h"
32 #include "extensions/browser/extension_registry.h" 34 #include "extensions/browser/extension_registry.h"
33 #include "extensions/common/extension.h" 35 #include "extensions/common/extension.h"
34 #include "grit/chromium_strings.h"
35 #include "grit/generated_resources.h"
36 #include "ui/base/l10n/l10n_util.h" 36 #include "ui/base/l10n/l10n_util.h"
37 37
38 using base::UserMetricsAction; 38 using base::UserMetricsAction;
39 39
40 namespace chromeos { 40 namespace chromeos {
41 namespace options { 41 namespace options {
42 42
43 CrosLanguageOptionsHandler::CrosLanguageOptionsHandler() { 43 CrosLanguageOptionsHandler::CrosLanguageOptionsHandler() {
44 } 44 }
45 45
(...skipping 218 matching lines...) Expand 10 before | Expand all | Expand 10 after
264 extension_ime_util::GetExtensionIDFromInputMethodID(input_method_id); 264 extension_ime_util::GetExtensionIDFromInputMethodID(input_method_id);
265 const extensions::Extension* extension = 265 const extensions::Extension* extension =
266 enabled_extensions.GetByID(extension_id); 266 enabled_extensions.GetByID(extension_id);
267 if (extension) 267 if (extension)
268 entry->SetString("extensionName", extension->name()); 268 entry->SetString("extensionName", extension->name());
269 } 269 }
270 } 270 }
271 271
272 } // namespace options 272 } // namespace options
273 } // namespace chromeos 273 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698