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

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

Issue 33913003: Remove kNaturalScrollDefault. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 6 years, 6 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
« no previous file with comments | « no previous file | chrome/browser/chromeos/preferences.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
73 #include "content/public/browser/render_frame_host.h" 73 #include "content/public/browser/render_frame_host.h"
74 #include "content/public/browser/web_contents.h" 74 #include "content/public/browser/web_contents.h"
75 #include "content/public/browser/web_ui.h" 75 #include "content/public/browser/web_ui.h"
76 #include "grit/browser_resources.h" 76 #include "grit/browser_resources.h"
77 #include "media/audio/sounds/sounds_manager.h" 77 #include "media/audio/sounds/sounds_manager.h"
78 #include "ui/aura/window.h" 78 #include "ui/aura/window.h"
79 #include "ui/base/resource/resource_bundle.h" 79 #include "ui/base/resource/resource_bundle.h"
80 #include "ui/compositor/layer.h" 80 #include "ui/compositor/layer.h"
81 #include "ui/compositor/layer_animation_observer.h" 81 #include "ui/compositor/layer_animation_observer.h"
82 #include "ui/compositor/scoped_layer_animation_settings.h" 82 #include "ui/compositor/scoped_layer_animation_settings.h"
83 #include "ui/events/event_utils.h"
84 #include "ui/gfx/display.h"
85 #include "ui/gfx/rect.h" 83 #include "ui/gfx/rect.h"
86 #include "ui/gfx/screen.h" 84 #include "ui/gfx/screen.h"
87 #include "ui/gfx/size.h" 85 #include "ui/gfx/size.h"
88 #include "ui/gfx/transform.h" 86 #include "ui/gfx/transform.h"
89 #include "ui/keyboard/keyboard_controller.h" 87 #include "ui/keyboard/keyboard_controller.h"
90 #include "ui/keyboard/keyboard_util.h" 88 #include "ui/keyboard/keyboard_util.h"
91 #include "ui/views/focus/focus_manager.h" 89 #include "ui/views/focus/focus_manager.h"
92 #include "ui/views/widget/widget.h" 90 #include "ui/views/widget/widget.h"
93 #include "ui/views/widget/widget_delegate.h" 91 #include "ui/views/widget/widget_delegate.h"
94 #include "ui/wm/core/window_animations.h" 92 #include "ui/wm/core/window_animations.h"
(...skipping 1207 matching lines...) Expand 10 before | Expand all | Expand 10 after
1302 scoped_ptr<locale_util::SwitchLanguageCallback> callback( 1300 scoped_ptr<locale_util::SwitchLanguageCallback> callback(
1303 new locale_util::SwitchLanguageCallback( 1301 new locale_util::SwitchLanguageCallback(
1304 base::Bind(&OnLanguageSwitchedCallback, base::Passed(data.Pass())))); 1302 base::Bind(&OnLanguageSwitchedCallback, base::Passed(data.Pass()))));
1305 1303
1306 // Load locale keyboards here. Hardware layout would be automatically enabled. 1304 // Load locale keyboards here. Hardware layout would be automatically enabled.
1307 locale_util::SwitchLanguage( 1305 locale_util::SwitchLanguage(
1308 locale, true, true /* login_layouts_only */, callback.Pass()); 1306 locale, true, true /* login_layouts_only */, callback.Pass());
1309 } 1307 }
1310 1308
1311 } // namespace chromeos 1309 } // namespace chromeos
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/chromeos/preferences.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698