summaryrefslogtreecommitdiffstats
path: root/components/error_page
diff options
context:
space:
mode:
authoredwardjung <edwardjung@chromium.org>2015-04-03 01:31:32 -0700
committerCommit bot <commit-bot@chromium.org>2015-04-03 08:32:06 +0000
commit8633d1fd54cb3cd6dc0aba0dc01f8284e5158ac2 (patch)
tree1b938bb81172fc4fcdb8395023d2c44914f179e3 /components/error_page
parentdb0712274f3316899199db620355e69c4d324e56 (diff)
downloadchromium_src-8633d1fd54cb3cd6dc0aba0dc01f8284e5158ac2.zip
chromium_src-8633d1fd54cb3cd6dc0aba0dc01f8284e5158ac2.tar.gz
chromium_src-8633d1fd54cb3cd6dc0aba0dc01f8284e5158ac2.tar.bz2
Improvements to the offline intersitial and easter egg
- Fix right click restart bug. - Switched image assets to use sprite sheets. - Fix resizing whilst jumping causes delays bug. - Add UMA counter for easter egg. - Gameplay tweaks. BUG=464330,453853 Review URL: https://codereview.chromium.org/1051433002 Cr-Commit-Position: refs/heads/master@{#323703}
Diffstat (limited to 'components/error_page')
-rw-r--r--components/error_page/common/net_error_info.h2
-rw-r--r--components/error_page/renderer/net_error_helper_core.cc4
-rw-r--r--components/error_page/renderer/net_error_helper_core.h1
3 files changed, 7 insertions, 0 deletions
diff --git a/components/error_page/common/net_error_info.h b/components/error_page/common/net_error_info.h
index cb0905b..071bbd6 100644
--- a/components/error_page/common/net_error_info.h
+++ b/components/error_page/common/net_error_info.h
@@ -31,6 +31,8 @@ enum NetworkErrorPageEvent {
NETWORK_ERROR_PAGE_BOTH_BUTTONS_RELOAD_CLICKED,
NETWORK_ERROR_PAGE_BOTH_BUTTONS_SHOWN_SAVED_COPY_CLICKED,
+ NETWORK_ERROR_EASTER_EGG_ACTIVATED, // Easter egg activated.
+
NETWORK_ERROR_PAGE_EVENT_MAX,
};
diff --git a/components/error_page/renderer/net_error_helper_core.cc b/components/error_page/renderer/net_error_helper_core.cc
index bbeffc7..8a9977c 100644
--- a/components/error_page/renderer/net_error_helper_core.cc
+++ b/components/error_page/renderer/net_error_helper_core.cc
@@ -926,6 +926,10 @@ void NetErrorHelperCore::ExecuteButtonPress(Button button) {
chrome_common_net::RecordEvent(
chrome_common_net::NETWORK_ERROR_PAGE_MORE_BUTTON_CLICKED);
return;
+ case EASTER_EGG:
+ chrome_common_net::RecordEvent(
+ chrome_common_net::NETWORK_ERROR_EASTER_EGG_ACTIVATED);
+ return;
case NO_BUTTON:
NOTREACHED();
return;
diff --git a/components/error_page/renderer/net_error_helper_core.h b/components/error_page/renderer/net_error_helper_core.h
index 4d880b8..bd16ed5 100644
--- a/components/error_page/renderer/net_error_helper_core.h
+++ b/components/error_page/renderer/net_error_helper_core.h
@@ -47,6 +47,7 @@ class NetErrorHelperCore {
RELOAD_BUTTON,
SHOW_SAVED_COPY_BUTTON,
MORE_BUTTON,
+ EASTER_EGG,
};
// The Delegate handles all interaction with the RenderView, WebFrame, and