TPM information dialog added to EULA screen

chrome/browser/chromeos/login/eula_view.h

Index: chrome/browser/chromeos/login/eula_view.h
diff --git a/chrome/browser/chromeos/login/eula_view.h b/chrome/browser/chromeos/login/eula_view.h
index 2d5683df2851fd6053cb0297f29f360033c365a1..4dcee918827376ca129a903b10ef3d4402089f9b 100644
--- a/chrome/browser/chromeos/login/eula_view.h
+++ b/chrome/browser/chromeos/login/eula_view.h
@@ -7,6 +7,7 @@
 #pragma once
 
 #include "base/scoped_ptr.h"
+#include "chrome/browser/chromeos/login/message_bubble.h"
 #include "chrome/browser/chromeos/login/view_screen.h"
 #include "chrome/browser/tab_contents/tab_contents_delegate.h"
 #include "gfx/native_widget_types.h"
@@ -75,6 +76,7 @@ class EulaView
     : public views::View,
       public views::ButtonListener,
       public views::LinkController,
+      public MessageBubbleDelegate,
       public EULATabContentsDelegate {
  public:
   explicit EulaView(chromeos::ScreenObserver* observer);
@@ -97,6 +99,11 @@ class EulaView
   void LinkActivated(views::Link* source, int event_flags);
 
  private:
+  // views::View implementation.
+  virtual bool SkipDefaultKeyEventProcessing(const views::KeyEvent& e) {
+    return true; }
+  virtual bool OnKeyPressed(const views::KeyEvent& e);
+
   // TabContentsDelegate implementation.
   virtual void NavigationStateChanged(const TabContents* contents,
                                       unsigned changed_flags);
@@ -111,6 +118,13 @@ class EulaView
                     views::Label* eula_label,
                     const GURL& eula_url);
 
+  // Overridden from views::InfoBubbleDelegate.
+  virtual void InfoBubbleClosing(InfoBubble* info_bubble,
+                                 bool closed_by_escape) { bubble_ = NULL; }
+  virtual bool CloseOnEscape() { return true; }
+  virtual bool FadeInOnShow() { return false; }
+  virtual void OnHelpLinkActivated() { }

[Nikita (slow), 2010/09/27 17:51:01]

{}

[glotov, 2010/09/27 18:52:01]

Done.

+
   // Dialog controls.
   views::Label* google_eula_label_;
   DOMView* google_eula_view_;
@@ -130,6 +144,10 @@ class EulaView
   // Help application used for help dialogs.
   scoped_ptr<HelpAppLauncher> help_app_;
 
+  // Pointer to shown message bubble. We don't need to delete it because
+  // it will be deleted on bubble closing.
+  MessageBubble* bubble_;
+
   DISALLOW_COPY_AND_ASSIGN(EulaView);
 };