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

Side by Side Diff: chrome/browser/chromeos/login/eula_view.cc

Issue 6976040: Revert 86914 - Move a bunch of functions from Window onto Widget. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 7 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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/eula_view.h" 5 #include "chrome/browser/chromeos/login/eula_view.h"
6 6
7 #include <signal.h> 7 #include <signal.h>
8 #include <sys/types.h> 8 #include <sys/types.h>
9 9
10 #include <string> 10 #include <string>
(...skipping 501 matching lines...) Expand 10 before | Expand all | Expand 10 after
512 if (source == learn_more_link_) { 512 if (source == learn_more_link_) {
513 if (!help_app_.get()) 513 if (!help_app_.get())
514 help_app_ = new HelpAppLauncher(parent_window); 514 help_app_ = new HelpAppLauncher(parent_window);
515 help_app_->ShowHelpTopic(HelpAppLauncher::HELP_STATS_USAGE); 515 help_app_->ShowHelpTopic(HelpAppLauncher::HELP_STATS_USAGE);
516 } else if (source == system_security_settings_link_) { 516 } else if (source == system_security_settings_link_) {
517 TpmInfoView* view = new TpmInfoView(&tpm_password_); 517 TpmInfoView* view = new TpmInfoView(&tpm_password_);
518 view->Init(); 518 view->Init();
519 views::Window* window = browser::CreateViewsWindow(parent_window, 519 views::Window* window = browser::CreateViewsWindow(parent_window,
520 gfx::Rect(), 520 gfx::Rect(),
521 view); 521 view);
522 window->SetAlwaysOnTop(true); 522 window->SetIsAlwaysOnTop(true);
523 window->Show(); 523 window->Show();
524 } 524 }
525 } 525 }
526 526
527 //////////////////////////////////////////////////////////////////////////////// 527 ////////////////////////////////////////////////////////////////////////////////
528 // TabContentsDelegate implementation: 528 // TabContentsDelegate implementation:
529 529
530 // Convenience function. Queries |eula_view| for HTML title and, if it 530 // Convenience function. Queries |eula_view| for HTML title and, if it
531 // is ready, assigns it to |eula_label| and returns true so the caller 531 // is ready, assigns it to |eula_label| and returns true so the caller
532 // view calls Layout(). 532 // view calls Layout().
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
591 591
592 bool EulaView::CloseOnEscape() { 592 bool EulaView::CloseOnEscape() {
593 return true; 593 return true;
594 } 594 }
595 595
596 bool EulaView::FadeInOnShow() { 596 bool EulaView::FadeInOnShow() {
597 return false; 597 return false;
598 } 598 }
599 599
600 } // namespace chromeos 600 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/login/background_view.cc ('k') | chrome/browser/chromeos/login/existing_user_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698