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

Side by Side Diff: chrome/browser/chromeos/system/ash_system_tray_delegate.cc

Issue 16105005: Cleanup legacy flags and switches (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: more Created 7 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
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/chromeos/system/ash_system_tray_delegate.h" 5 #include "chrome/browser/chromeos/system/ash_system_tray_delegate.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <set> 8 #include <set>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 583 matching lines...) Expand 10 before | Expand all | Expand 10 after
594 !user->is_logged_in()) { 594 !user->is_logged_in()) {
595 has_regular_not_logged_in_users = true; 595 has_regular_not_logged_in_users = true;
596 break; 596 break;
597 } 597 }
598 } 598 }
599 599
600 // Launch sign in screen to add another user to current session. 600 // Launch sign in screen to add another user to current session.
601 if (has_regular_not_logged_in_users) { 601 if (has_regular_not_logged_in_users) {
602 ash::Shell::GetInstance()-> 602 ash::Shell::GetInstance()->
603 desktop_background_controller()->MoveDesktopToLockedContainer(); 603 desktop_background_controller()->MoveDesktopToLockedContainer();
604 ShowLoginWizard(std::string(), gfx::Size()); 604 ShowLoginWizard(std::string());
605 } 605 }
606 } 606 }
607 607
608 virtual void ShutDown() OVERRIDE { 608 virtual void ShutDown() OVERRIDE {
609 ash::Shell::GetInstance()->session_state_controller()->RequestShutdown(); 609 ash::Shell::GetInstance()->session_state_controller()->RequestShutdown();
610 } 610 }
611 611
612 virtual void SignOut() OVERRIDE { 612 virtual void SignOut() OVERRIDE {
613 chrome::AttemptUserExit(); 613 chrome::AttemptUserExit();
614 } 614 }
(...skipping 722 matching lines...) Expand 10 before | Expand all | Expand 10 after
1337 DISALLOW_COPY_AND_ASSIGN(SystemTrayDelegate); 1337 DISALLOW_COPY_AND_ASSIGN(SystemTrayDelegate);
1338 }; 1338 };
1339 1339
1340 } // namespace 1340 } // namespace
1341 1341
1342 ash::SystemTrayDelegate* CreateSystemTrayDelegate() { 1342 ash::SystemTrayDelegate* CreateSystemTrayDelegate() {
1343 return new chromeos::SystemTrayDelegate(); 1343 return new chromeos::SystemTrayDelegate();
1344 } 1344 }
1345 1345
1346 } // namespace chromeos 1346 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/policy/device_local_account_browsertest.cc ('k') | chromeos/chromeos_switches.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698