media: Refactor PlatformVerificationFlow.

chrome/browser/chromeos/attestation/platform_verification_dialog.cc

Index: chrome/browser/chromeos/attestation/platform_verification_dialog.cc
diff --git a/chrome/browser/chromeos/attestation/platform_verification_dialog.cc b/chrome/browser/chromeos/attestation/platform_verification_dialog.cc
index a4c3fab6f1bcf7db9b25c3f83e59b00a054c3063..f2ec4e9784211747f07b5255b8c197fee44ed690 100644
--- a/chrome/browser/chromeos/attestation/platform_verification_dialog.cc
+++ b/chrome/browser/chromeos/attestation/platform_verification_dialog.cc
@@ -40,7 +40,7 @@ const int kDialogMaxWidthInPixel = 400;
 views::Widget* PlatformVerificationDialog::ShowDialog(
     content::WebContents* web_contents,
     const GURL& requesting_origin,
-    const PlatformVerificationFlow::Delegate::ConsentCallback& callback) {
+    const ConsentCallback& callback) {
   // In the case of an extension or hosted app, the origin of the request is
   // best described by the extension / app name.
   const extensions::Extension* extension =
@@ -74,7 +74,7 @@ PlatformVerificationDialog::~PlatformVerificationDialog() {
 PlatformVerificationDialog::PlatformVerificationDialog(
     content::WebContents* web_contents,
     const base::string16& domain,
-    const PlatformVerificationFlow::Delegate::ConsentCallback& callback)
+    const ConsentCallback& callback)
     : content::WebContentsObserver(web_contents),
       domain_(domain),
       callback_(callback) {
@@ -93,19 +93,19 @@ PlatformVerificationDialog::PlatformVerificationDialog(
 }
 
 bool PlatformVerificationDialog::Cancel() {
-  callback_.Run(PlatformVerificationFlow::CONSENT_RESPONSE_DENY);
+  callback_.Run(CONSENT_RESPONSE_DENY);
   return true;
 }
 
 bool PlatformVerificationDialog::Accept() {
-  callback_.Run(PlatformVerificationFlow::CONSENT_RESPONSE_ALLOW);
+  callback_.Run(CONSENT_RESPONSE_ALLOW);
   return true;
 }
 
 bool PlatformVerificationDialog::Close() {
   // This method is called when the tab is closed and in that case the decision

[ddorwin, 2015/03/12 21:38:53]

What function handles the 'X' and "esc"?

[xhwang, 2015/03/13 00:54:42]

This is the function for 'x' and 'esc'.

[ddorwin, 2015/03/13 17:03:09]

The comment says "tab". Should that say "dialog" or something like that?

[xhwang, 2015/03/13 21:31:15]

Updated comments.

   // hasn't been made yet.
-  callback_.Run(PlatformVerificationFlow::CONSENT_RESPONSE_NONE);
+  callback_.Run(CONSENT_RESPONSE_NONE);
   return true;
 }