Added browser and OS credits link to EULA page.

chrome/browser/ui/webui/chromeos/login/eula_screen_handler.cc

Index: chrome/browser/ui/webui/chromeos/login/eula_screen_handler.cc
diff --git a/chrome/browser/ui/webui/chromeos/login/eula_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/eula_screen_handler.cc
index 8e37a38263361cb3fef51e28b62ee094161a65af..dd8c047fe9a4264162e87b3502635aab92622f80 100644
--- a/chrome/browser/ui/webui/chromeos/login/eula_screen_handler.cc
+++ b/chrome/browser/ui/webui/chromeos/login/eula_screen_handler.cc
@@ -6,20 +6,89 @@
 
 #include <string>
 
+#include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/chromeos/login/help_app_launcher.h"
+#include "chrome/browser/chromeos/login/helper.h"
+#include "chrome/browser/chromeos/login/login_web_dialog.h"
 #include "chrome/browser/chromeos/login/screens/core_oobe_actor.h"
 #include "chrome/browser/chromeos/login/webui_login_display.h"
 #include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h"
 #include "chrome/common/url_constants.h"
+#include "content/public/browser/web_contents.h"
 #include "grit/browser_resources.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
+#include "grit/locale_settings.h"
+#include "ui/base/l10n/l10n_util.h"
 #include "ui/views/widget/widget.h"
+#include "url/gurl.h"
 
 namespace {
 
 const char kJsScreenPath[] = "login.EulaScreen";
 
+// Helper class to tweak display details of credits pages in the context
+// of OOBE/EULA step.
+class CreditsWebDialog : public chromeos::LoginWebDialog {
+ public:
+  CreditsWebDialog(Profile* profile,
+                   gfx::NativeWindow parent_window,
+                   int title_id,
+                   const GURL& url)
+      : chromeos::LoginWebDialog(profile, NULL, parent_window,
+                                 l10n_util::GetStringUTF16(title_id),
+                                 url,
+                                 chromeos::LoginWebDialog::STYLE_BUBBLE) {
+  }
+
+  virtual void OnLoadingStateChanged(content::WebContents* source) OVERRIDE {
+    chromeos::LoginWebDialog::OnLoadingStateChanged(source);
+    // Remove visual elements that we can handle in EULA page.
+    bool is_loading = source->IsLoading();
+    if (!is_loading && source->GetWebUI()) {
+      source->GetWebUI()->CallJavascriptFunction(
+          "(function HideElements() {\n"

[xiyuan, 2014/05/13 00:28:41]

nit: "\n" is not needed here and other places.

[xiyuan, 2014/05/13 00:28:41]

nit: HideElement -> hideElement.  Actually, we don't need function name here at
all.

[zel, 2014/05/13 20:19:23]

Done.

+          "  function injectStyles(rule) {\n"
+          "    var css = rule,\n"

[xiyuan, 2014/05/13 00:28:41]

, -> ;

[zel, 2014/05/13 20:19:23]

Done.

+          "    head = document.head ||\n"

[xiyuan, 2014/05/13 00:28:41]

nit: var head = ...

[zel, 2014/05/13 20:19:23]

Done.

+          "           document.getElementsByTagName('head')[0],\n"
+          "    style = document.createElement('style');\n"

[xiyuan, 2014/05/13 00:28:41]

nit: var style = ...

[zel, 2014/05/13 20:19:23]

Done.

+          "    style.type = 'text/css';\n"
+          "    if (style.styleSheet){\n"
+          "      style.styleSheet.cssText = css;\n"
+          "    } else {\n"
+          "      style.appendChild(document.createTextNode(css));\n"
+          "    }\n"
+          "    head.appendChild(style);\n"
+          "  }\n"
+          "  injectStyles('#print-link { display: none; }');\n"
+          "  injectStyles('.homepage { display: none; }');\n"

[xiyuan, 2014/05/13 00:28:41]

Since we are modifying about_os_credits.html to add the name, why not put the
rules into the file and only trigger it here?

e.g.
In about_os_credits.html, add the following to css

.dialog #print-link { display: none; }
.dialog .homepage { display: none; }

then the JS here could be just add "dialog", e.g.
document.body.classList.toggle('dialog', true);

[zel, 2014/05/13 20:19:23]

Done.

+          "})");
+    }
+  }
+
+ private:
+  DISALLOW_COPY_AND_ASSIGN(CreditsWebDialog);
+};
+
+
+void ShowCreditsDialog(Profile* profile,
+                       gfx::NativeWindow parent_window,
+                       int title_id,
+                       const GURL& credits_url) {
+  CreditsWebDialog* dialog = new CreditsWebDialog(profile,
+                                                  parent_window,
+                                                  title_id,
+                                                  credits_url);
+  gfx::Rect screen_bounds(chromeos::CalculateScreenBounds(gfx::Size()));
+  dialog->SetDialogSize(l10n_util::GetLocalizedContentsWidthInPixels(
+                            IDS_CREDITS_APP_DIALOG_WIDTH_PIXELS),
+                        l10n_util::GetLocalizedContentsWidthInPixels(
+                            IDS_CREDITS_APP_DIALOG_HEIGHT_PIXELS));
+  dialog->Show();
+  // The dialog object will be deleted on dialog close.
+}
+
 }  // namespace
 
 namespace chromeos {
@@ -82,6 +151,10 @@ void EulaScreenHandler::DeclareLocalizedValues(
                 IDS_EULA_RLZ_ENABLE,
                 IDS_SHORT_PRODUCT_OS_NAME);
 #endif
+
+

[xiyuan, 2014/05/13 00:28:41]

nit: keep only one empty line.

[zel, 2014/05/13 20:19:23]

Done.

+  builder->Add("chromeCreditsLink", IDS_ABOUT_VERSION_LICENSE_EULA);
+  builder->Add("chromeosCreditsLink", IDS_ABOUT_CROS_VERSION_LICENSE_EULA);
 }
 
 void EulaScreenHandler::GetAdditionalParameters(base::DictionaryValue* dict) {
@@ -112,6 +185,11 @@ void EulaScreenHandler::Initialize() {
 void EulaScreenHandler::RegisterMessages() {
   AddCallback("eulaOnExit", &EulaScreenHandler::HandleOnExit);
   AddCallback("eulaOnLearnMore", &EulaScreenHandler::HandleOnLearnMore);
+  AddCallback("eulaOnChromeOSCredits",
+              &EulaScreenHandler::HandleOnChromeOSCredits);
+  AddCallback("eulaOnChromeCredits",
+              &EulaScreenHandler::HandleOnChromeCredits);
+  AddCallback("eulaOnLearnMore", &EulaScreenHandler::HandleOnLearnMore);
   AddCallback("eulaOnInstallationSettingsPopupOpened",
               &EulaScreenHandler::HandleOnInstallationSettingsPopupOpened);
 }
@@ -131,6 +209,24 @@ void EulaScreenHandler::HandleOnLearnMore() {
   help_app_->ShowHelpTopic(HelpAppLauncher::HELP_STATS_USAGE);
 }
 
+void EulaScreenHandler::HandleOnChromeOSCredits() {
+  ShowCreditsDialog(
+      Profile::FromBrowserContext(
+          web_ui()->GetWebContents()->GetBrowserContext()),
+      GetNativeWindow(),
+      IDS_ABOUT_CROS_VERSION_LICENSE_EULA,
+      GURL(chrome::kChromeUIOSCreditsURL));
+}
+
+void EulaScreenHandler::HandleOnChromeCredits() {
+  ShowCreditsDialog(
+      Profile::FromBrowserContext(
+          web_ui()->GetWebContents()->GetBrowserContext()),
+      GetNativeWindow(),
+      IDS_ABOUT_VERSION_LICENSE_EULA,
+      GURL(chrome::kChromeUICreditsURL));
+}
+
 void EulaScreenHandler::HandleOnInstallationSettingsPopupOpened() {
   if (delegate_)
     delegate_->InitiatePasswordFetch();