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

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

Issue 662763002: Support modal windows (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git/+/master
Patch Set: Created 6 years, 2 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
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 1046 matching lines...) Expand 10 before | Expand all | Expand 10 after
1057 1057
1058 views::Widget::InitParams params( 1058 views::Widget::InitParams params(
1059 views::Widget::InitParams::TYPE_WINDOW_FRAMELESS); 1059 views::Widget::InitParams::TYPE_WINDOW_FRAMELESS);
1060 params.bounds = background_bounds(); 1060 params.bounds = background_bounds();
1061 params.show_state = ui::SHOW_STATE_FULLSCREEN; 1061 params.show_state = ui::SHOW_STATE_FULLSCREEN;
1062 params.opacity = views::Widget::InitParams::TRANSLUCENT_WINDOW; 1062 params.opacity = views::Widget::InitParams::TRANSLUCENT_WINDOW;
1063 #if defined(USE_ATHENA) 1063 #if defined(USE_ATHENA)
1064 athena::ScreenManager::ContainerParams container_params( 1064 athena::ScreenManager::ContainerParams container_params(
1065 "LoginScreen", athena::CP_LOGIN_SCREEN); 1065 "LoginScreen", athena::CP_LOGIN_SCREEN);
1066 container_params.can_activate_children = true; 1066 container_params.can_activate_children = true;
1067 container_params.block_events = true;
1068 container_params.modal_container_priority =
1069 athena::CP_LOGIN_SCREEN_SYSTEM_MODAL;
1067 login_screen_container_.reset( 1070 login_screen_container_.reset(
1068 athena::ScreenManager::Get()->CreateContainer(container_params)); 1071 athena::ScreenManager::Get()->CreateContainer(container_params));
1069 params.parent = login_screen_container_.get(); 1072 params.parent = login_screen_container_.get();
1070 login_screen_container_->SetLayoutManager( 1073 login_screen_container_->SetLayoutManager(
1071 new athena::FillLayoutManager(login_screen_container_.get())); 1074 new athena::FillLayoutManager(login_screen_container_.get()));
1072 #else 1075 #else
1073 params.parent = 1076 params.parent =
1074 ash::Shell::GetContainer(ash::Shell::GetPrimaryRootWindow(), 1077 ash::Shell::GetContainer(ash::Shell::GetPrimaryRootWindow(),
1075 ash::kShellWindowId_LockScreenContainer); 1078 ash::kShellWindowId_LockScreenContainer);
1076 #endif 1079 #endif
(...skipping 219 matching lines...) Expand 10 before | Expand all | Expand 10 after
1296 scoped_ptr<locale_util::SwitchLanguageCallback> callback( 1299 scoped_ptr<locale_util::SwitchLanguageCallback> callback(
1297 new locale_util::SwitchLanguageCallback( 1300 new locale_util::SwitchLanguageCallback(
1298 base::Bind(&OnLanguageSwitchedCallback, base::Passed(data.Pass())))); 1301 base::Bind(&OnLanguageSwitchedCallback, base::Passed(data.Pass()))));
1299 1302
1300 // Load locale keyboards here. Hardware layout would be automatically enabled. 1303 // Load locale keyboards here. Hardware layout would be automatically enabled.
1301 locale_util::SwitchLanguage( 1304 locale_util::SwitchLanguage(
1302 locale, true, true /* login_layouts_only */, callback.Pass()); 1305 locale, true, true /* login_layouts_only */, callback.Pass());
1303 } 1306 }
1304 1307
1305 } // namespace chromeos 1308 } // namespace chromeos
OLDNEW
« athena/screen/screen_manager_impl.cc ('K') | « chrome/browser/chromeos/login/ui/lock_window_aura.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698