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

Side by Side Diff: chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h

Issue 213623004: Partial revert of CL 190633002. JS wrapper for GAIA iframe focus grab is back (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Code block moved. Created 6 years, 8 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 | « no previous file | chrome/browser/ui/webui/chromeos/login/signin_screen_handler.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 (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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 #ifndef CHROME_BROWSER_UI_WEBUI_CHROMEOS_LOGIN_SIGNIN_SCREEN_HANDLER_H_ 5 #ifndef CHROME_BROWSER_UI_WEBUI_CHROMEOS_LOGIN_SIGNIN_SCREEN_HANDLER_H_
6 #define CHROME_BROWSER_UI_WEBUI_CHROMEOS_LOGIN_SIGNIN_SCREEN_HANDLER_H_ 6 #define CHROME_BROWSER_UI_WEBUI_CHROMEOS_LOGIN_SIGNIN_SCREEN_HANDLER_H_
7 7
8 #include <set> 8 #include <set>
9 #include <string> 9 #include <string>
10 10
(...skipping 446 matching lines...) Expand 10 before | Expand all | Expand 10 after
457 457
458 // A delegate used to get gfx::NativeWindow. 458 // A delegate used to get gfx::NativeWindow.
459 NativeWindowDelegate* native_window_delegate_; 459 NativeWindowDelegate* native_window_delegate_;
460 460
461 // Whether screen should be shown right after initialization. 461 // Whether screen should be shown right after initialization.
462 bool show_on_init_; 462 bool show_on_init_;
463 463
464 // Keeps whether screen should be shown for OOBE. 464 // Keeps whether screen should be shown for OOBE.
465 bool oobe_ui_; 465 bool oobe_ui_;
466 466
467 // Is focus still stolen from Gaia page?
468 bool focus_stolen_;
469
467 // Has Gaia page silent load been started for the current sign-in attempt? 470 // Has Gaia page silent load been started for the current sign-in attempt?
468 bool gaia_silent_load_; 471 bool gaia_silent_load_;
469 472
470 // The active network at the moment when Gaia page was preloaded. 473 // The active network at the moment when Gaia page was preloaded.
471 std::string gaia_silent_load_network_; 474 std::string gaia_silent_load_network_;
472 475
473 // Is account picker being shown for the first time. 476 // Is account picker being shown for the first time.
474 bool is_account_picker_showing_first_time_; 477 bool is_account_picker_showing_first_time_;
475 478
476 // True if dns cache cleanup is done. 479 // True if dns cache cleanup is done.
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
544 547
545 // Helper that retrieves the authenticated user's e-mail address. 548 // Helper that retrieves the authenticated user's e-mail address.
546 scoped_ptr<AuthenticatedUserEmailRetriever> email_retriever_; 549 scoped_ptr<AuthenticatedUserEmailRetriever> email_retriever_;
547 550
548 DISALLOW_COPY_AND_ASSIGN(SigninScreenHandler); 551 DISALLOW_COPY_AND_ASSIGN(SigninScreenHandler);
549 }; 552 };
550 553
551 } // namespace chromeos 554 } // namespace chromeos
552 555
553 #endif // CHROME_BROWSER_UI_WEBUI_CHROMEOS_LOGIN_SIGNIN_SCREEN_HANDLER_H_ 556 #endif // CHROME_BROWSER_UI_WEBUI_CHROMEOS_LOGIN_SIGNIN_SCREEN_HANDLER_H_
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698