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

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

Issue 330763005: [cros touch] Proper handling of non-maximized/fullscreen windows in lock screen container (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
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 | Annotate | Revision Log
« no previous file with comments | « ash/wm/lock_window_state.cc ('k') | no next file » | 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 1022 matching lines...) Expand 10 before | Expand all | Expand 10 after
1033 1033
1034 focus_ring_controller_.reset(new FocusRingController); 1034 focus_ring_controller_.reset(new FocusRingController);
1035 focus_ring_controller_->SetVisible(true); 1035 focus_ring_controller_->SetVisible(true);
1036 1036
1037 keyboard_driven_oobe_key_handler_.reset(new KeyboardDrivenOobeKeyHandler); 1037 keyboard_driven_oobe_key_handler_.reset(new KeyboardDrivenOobeKeyHandler);
1038 } 1038 }
1039 1039
1040 views::Widget::InitParams params( 1040 views::Widget::InitParams params(
1041 views::Widget::InitParams::TYPE_WINDOW_FRAMELESS); 1041 views::Widget::InitParams::TYPE_WINDOW_FRAMELESS);
1042 params.bounds = background_bounds(); 1042 params.bounds = background_bounds();
1043 params.show_state = ui::SHOW_STATE_MAXIMIZED; 1043 params.show_state = ui::SHOW_STATE_FULLSCREEN;
1044 params.opacity = views::Widget::InitParams::TRANSLUCENT_WINDOW; 1044 params.opacity = views::Widget::InitParams::TRANSLUCENT_WINDOW;
1045 params.parent = 1045 params.parent =
1046 ash::Shell::GetContainer(ash::Shell::GetPrimaryRootWindow(), 1046 ash::Shell::GetContainer(ash::Shell::GetPrimaryRootWindow(),
1047 ash::kShellWindowId_LockScreenContainer); 1047 ash::kShellWindowId_LockScreenContainer);
1048 1048
1049 login_window_ = new views::Widget; 1049 login_window_ = new views::Widget;
1050 params.delegate = new LoginWidgetDelegate(login_window_); 1050 params.delegate = new LoginWidgetDelegate(login_window_);
1051 login_window_->Init(params); 1051 login_window_->Init(params);
1052 1052
1053 login_view_ = new WebUILoginView(); 1053 login_view_ = new WebUILoginView();
(...skipping 207 matching lines...) Expand 10 before | Expand all | Expand 10 after
1261 scoped_ptr<locale_util::SwitchLanguageCallback> callback( 1261 scoped_ptr<locale_util::SwitchLanguageCallback> callback(
1262 new locale_util::SwitchLanguageCallback( 1262 new locale_util::SwitchLanguageCallback(
1263 base::Bind(&OnLanguageSwitchedCallback, base::Passed(data.Pass())))); 1263 base::Bind(&OnLanguageSwitchedCallback, base::Passed(data.Pass()))));
1264 1264
1265 // Load locale keyboards here. Hardware layout would be automatically enabled. 1265 // Load locale keyboards here. Hardware layout would be automatically enabled.
1266 locale_util::SwitchLanguage( 1266 locale_util::SwitchLanguage(
1267 locale, true, true /* login_layouts_only */, callback.Pass()); 1267 locale, true, true /* login_layouts_only */, callback.Pass());
1268 } 1268 }
1269 1269
1270 } // namespace chromeos 1270 } // namespace chromeos
OLDNEW
« no previous file with comments | « ash/wm/lock_window_state.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698