media: Refactor PlatformVerificationFlow.

chrome/browser/chromeos/attestation/platform_verification_dialog.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/chromeos/attestation/platform_verification_dialog.h"
 
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/browser_navigator.h"
@@ skipping 22 matching lines @@
 namespace {
 
 const int kDialogMaxWidthInPixel = 400;
 
 }  // namespace
 
 // static
 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 =
       extensions::ExtensionRegistry::Get(web_contents->GetBrowserContext())
           ->enabled_extensions()
           .GetExtensionOrAppByURL(web_contents->GetLastCommittedURL());
 
   // TODO(xhwang): We should only show the name if the request if from the
   // extension's true frame. See http://crbug.com/455821
   std::string origin = extension ? extension->name() : requesting_origin.spec();
@@ skipping 13 matching lines @@
 
   return widget;
 }
 
 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) {
   SetLayoutManager(new views::FillLayout());
   SetBorder(views::Border::CreateEmptyBorder(
       0, views::kButtonHEdgeMarginNew, 0, views::kButtonHEdgeMarginNew));
   const base::string16 learn_more = l10n_util::GetStringUTF16(IDS_LEARN_MORE);
   std::vector<size_t> offsets;
   base::string16 headline = l10n_util::GetStringFUTF16(
       IDS_PLATFORM_VERIFICATION_DIALOG_HEADLINE, domain_, learn_more, &offsets);
   views::StyledLabel* headline_label = new views::StyledLabel(headline, this);
   headline_label->AddStyleRange(
       gfx::Range(offsets[1], offsets[1] + learn_more.size()),
       views::StyledLabel::RangeStyleInfo::CreateForLink());
   AddChildView(headline_label);
 }
 
 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;
 }
 
 base::string16 PlatformVerificationDialog::GetDialogButtonLabel(
     ui::DialogButton button) const {
   switch (button) {
     case ui::DIALOG_BUTTON_OK:
       return l10n_util::GetStringUTF16(IDS_PLATFORM_VERIFICATION_DIALOG_ALLOW);
     case ui::DIALOG_BUTTON_CANCEL:
       return l10n_util::GetStringFUTF16(
@@ skipping 35 matching lines @@
 void PlatformVerificationDialog::DidStartNavigationToPendingEntry(
     const GURL& url,
     content::NavigationController::ReloadType reload_type) {
   views::Widget* widget = GetWidget();
   if (widget)
     widget->Close();
 }
 
 }  // namespace attestation
 }  // namespace chromeos