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

Side by Side Diff: chrome/browser/chromeos/login/ui/login_display_host_impl.cc

Issue 448423002: Use a qualified path for grit includes in chrome/browser/chromeos. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix build Created 6 years, 4 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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/chromeos/login/ui/login_display_host_impl.h" 5 #include "chrome/browser/chromeos/login/ui/login_display_host_impl.h"
6 6
7 #include <vector> 7 #include <vector>
8 8
9 #include "ash/audio/sounds.h" 9 #include "ash/audio/sounds.h"
10 #include "ash/desktop_background/desktop_background_controller.h" 10 #include "ash/desktop_background/desktop_background_controller.h"
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
52 #include "chrome/browser/chromeos/net/delay_network_call.h" 52 #include "chrome/browser/chromeos/net/delay_network_call.h"
53 #include "chrome/browser/chromeos/policy/auto_enrollment_client.h" 53 #include "chrome/browser/chromeos/policy/auto_enrollment_client.h"
54 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h" 54 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h"
55 #include "chrome/browser/chromeos/system/input_device_settings.h" 55 #include "chrome/browser/chromeos/system/input_device_settings.h"
56 #include "chrome/browser/chromeos/ui/focus_ring_controller.h" 56 #include "chrome/browser/chromeos/ui/focus_ring_controller.h"
57 #include "chrome/browser/lifetime/application_lifetime.h" 57 #include "chrome/browser/lifetime/application_lifetime.h"
58 #include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h" 58 #include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h"
59 #include "chrome/common/chrome_constants.h" 59 #include "chrome/common/chrome_constants.h"
60 #include "chrome/common/chrome_switches.h" 60 #include "chrome/common/chrome_switches.h"
61 #include "chrome/common/pref_names.h" 61 #include "chrome/common/pref_names.h"
62 #include "chrome/grit/browser_resources.h"
62 #include "chromeos/audio/chromeos_sounds.h" 63 #include "chromeos/audio/chromeos_sounds.h"
63 #include "chromeos/chromeos_constants.h" 64 #include "chromeos/chromeos_constants.h"
64 #include "chromeos/chromeos_switches.h" 65 #include "chromeos/chromeos_switches.h"
65 #include "chromeos/dbus/dbus_thread_manager.h" 66 #include "chromeos/dbus/dbus_thread_manager.h"
66 #include "chromeos/dbus/session_manager_client.h" 67 #include "chromeos/dbus/session_manager_client.h"
67 #include "chromeos/ime/extension_ime_util.h" 68 #include "chromeos/ime/extension_ime_util.h"
68 #include "chromeos/ime/input_method_manager.h" 69 #include "chromeos/ime/input_method_manager.h"
69 #include "chromeos/login/login_state.h" 70 #include "chromeos/login/login_state.h"
70 #include "chromeos/settings/timezone_settings.h" 71 #include "chromeos/settings/timezone_settings.h"
71 #include "components/session_manager/core/session_manager.h" 72 #include "components/session_manager/core/session_manager.h"
72 #include "content/public/browser/notification_service.h" 73 #include "content/public/browser/notification_service.h"
73 #include "content/public/browser/notification_types.h" 74 #include "content/public/browser/notification_types.h"
74 #include "content/public/browser/render_frame_host.h" 75 #include "content/public/browser/render_frame_host.h"
75 #include "content/public/browser/web_contents.h" 76 #include "content/public/browser/web_contents.h"
76 #include "content/public/browser/web_ui.h" 77 #include "content/public/browser/web_ui.h"
77 #include "grit/browser_resources.h"
78 #include "media/audio/sounds/sounds_manager.h" 78 #include "media/audio/sounds/sounds_manager.h"
79 #include "ui/aura/window.h" 79 #include "ui/aura/window.h"
80 #include "ui/base/resource/resource_bundle.h" 80 #include "ui/base/resource/resource_bundle.h"
81 #include "ui/base/ui_base_switches_util.h" 81 #include "ui/base/ui_base_switches_util.h"
82 #include "ui/compositor/layer.h" 82 #include "ui/compositor/layer.h"
83 #include "ui/compositor/layer_animation_observer.h" 83 #include "ui/compositor/layer_animation_observer.h"
84 #include "ui/compositor/scoped_layer_animation_settings.h" 84 #include "ui/compositor/scoped_layer_animation_settings.h"
85 #include "ui/events/event_utils.h" 85 #include "ui/events/event_utils.h"
86 #include "ui/gfx/display.h" 86 #include "ui/gfx/display.h"
87 #include "ui/gfx/rect.h" 87 #include "ui/gfx/rect.h"
(...skipping 1186 matching lines...) Expand 10 before | Expand all | Expand 10 after
1274 scoped_ptr<locale_util::SwitchLanguageCallback> callback( 1274 scoped_ptr<locale_util::SwitchLanguageCallback> callback(
1275 new locale_util::SwitchLanguageCallback( 1275 new locale_util::SwitchLanguageCallback(
1276 base::Bind(&OnLanguageSwitchedCallback, base::Passed(data.Pass())))); 1276 base::Bind(&OnLanguageSwitchedCallback, base::Passed(data.Pass()))));
1277 1277
1278 // Load locale keyboards here. Hardware layout would be automatically enabled. 1278 // Load locale keyboards here. Hardware layout would be automatically enabled.
1279 locale_util::SwitchLanguage( 1279 locale_util::SwitchLanguage(
1280 locale, true, true /* login_layouts_only */, callback.Pass()); 1280 locale, true, true /* login_layouts_only */, callback.Pass());
1281 } 1281 }
1282 1282
1283 } // namespace chromeos 1283 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/login/ui/captive_portal_view.cc ('k') | chrome/browser/chromeos/login/ui/proxy_settings_dialog.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698