[invalidations] Created a stub about:invalidations

Added the minimum changes necessary to get the about:invalidations page to display a "Works" text in HTML. In following patches, functionality will be added to display the connection status, the invalidations count for each datatype and other debugging information. Work was based on signin work carried out in issue=11377015 and following patches. BUG=263863 Review URL: https://codereview.chromium.org/144093005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@248029 0039d316-1c4b-4281-b951-d872f2087c98
cbchan · Jan 30, 2014 · f17be76 · f17be76
1 parent 9043979
commit f17be76
Show file tree

Hide file tree

Showing 15 changed files with 128 additions and 0 deletions.
diff --git a/chrome/browser/browser_about_handler_unittest.cc b/chrome/browser/browser_about_handler_unittest.cc
@@ -55,6 +55,10 @@ TEST_F(BrowserAboutHandlerTest, WillHandleBrowserAboutURL) {
         GURL(chrome_prefix + chrome::kChromeUISyncHost),
         GURL(chrome_prefix + chrome::kChromeUISyncInternalsHost)
       },
+      {
+        GURL(chrome_prefix + chrome::kChromeUIInvalidationsHost),
+        GURL(chrome_prefix + chrome::kChromeUIInvalidationsHost)
+      },
       {
         GURL(chrome_prefix + "host/path?query#ref"),
         GURL(chrome_prefix + "host/path?query#ref"),

diff --git a/chrome/browser/resources/about_invalidations.css b/chrome/browser/resources/about_invalidations.css
@@ -0,0 +1,8 @@
+/* Copyright 2014 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.
+ */
+
+/*
+ * TODO(mferreria): Implement this CSS. See http://crbug.com/263863
+ */
diff --git a/chrome/browser/resources/about_invalidations.html b/chrome/browser/resources/about_invalidations.html
@@ -0,0 +1,17 @@
+<html>
+<head>
+  <title>Invalidations</title>
+  <script src="chrome://resources/js/cr.js"></script>
+  <script src="chrome://resources/js/parse_html_subset.js"></script>
+  <script src="chrome://resources/js/util.js"></script>
+  <script src="chrome://invalidations/about_invalidations.js"></script>
+  <link rel="stylesheet" type="text/css" href="about_invalidations.css">
+</head>
+
+<body>
+  <h1>Invalidations Debug Information
+    <button id='refresh-invalidation-data'>Refresh</button></h1>
+</body>
+
+
+</html>
diff --git a/chrome/browser/resources/about_invalidations.js b/chrome/browser/resources/about_invalidations.js
@@ -0,0 +1,8 @@
+// Copyright 2014 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.
+
+
+// TODO(mferreria): Implement in this JS the ability to get from the C++ Layer
+// the invalidations history and display them as they come.
+// See http://crbug.com/263863
diff --git a/chrome/browser/resources/invalidations_resources.grd b/chrome/browser/resources/invalidations_resources.grd
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<grit latest_public_release="0" current_release="1">
+  <outputs>
+    <output filename="grit/invalidations_resources.h" type="rc_header">
+      <emit emit_type='prepend'></emit>
+    </output>
+    <output filename="invalidations_resources.pak" type="data_package" />
+  </outputs>
+  <release seq="1">
+    <includes>
+      <include name="IDR_ABOUT_INVALIDATIONS_HTML" file="about_invalidations.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" />
+      <include name="IDR_ABOUT_INVALIDATIONS_JS" file="about_invalidations.js" type="BINDATA" />
+      <include name="IDR_ABOUT_INVALIDATIONS_CSS" file="about_invalidations.css" type="BINDATA" />
+    </includes>
+  </release>
+</grit>
diff --git a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
@@ -34,6 +34,7 @@
 #include "chrome/browser/ui/webui/identity_internals_ui.h"
 #include "chrome/browser/ui/webui/inspect_ui.h"
 #include "chrome/browser/ui/webui/instant_ui.h"
+#include "chrome/browser/ui/webui/invalidations_ui.h"
 #include "chrome/browser/ui/webui/memory_internals/memory_internals_ui.h"
 #include "chrome/browser/ui/webui/net_internals/net_internals_ui.h"
 #include "chrome/browser/ui/webui/ntp/new_tab_ui.h"
@@ -260,6 +261,8 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* web_ui,
     return &NewWebUI<HistoryUI>;
   if (url.host() == chrome::kChromeUIInstantHost)
     return &NewWebUI<InstantUI>;
+  if (url.host() == chrome::kChromeUIInvalidationsHost)
+    return &NewWebUI<InvalidationsUI>;
   if (url.host() == chrome::kChromeUIManagedUserPassphrasePageHost)
     return &NewWebUI<ConstrainedWebDialogUI>;
   if (url.host() == chrome::kChromeUIMemoryInternalsHost)

diff --git a/chrome/browser/ui/webui/invalidations_ui.cc b/chrome/browser/ui/webui/invalidations_ui.cc
@@ -0,0 +1,31 @@
+// Copyright 2014 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/ui/webui/invalidations_ui.h"
+
+#include "chrome/browser/profiles/profile.h"
+#include "chrome/common/url_constants.h"
+#include "content/public/browser/web_ui.h"
+#include "content/public/browser/web_ui_data_source.h"
+#include "grit/invalidations_resources.h"
+
+content::WebUIDataSource* CreateInvalidationsHTMLSource() {
+  // This is done once per opening of the page
+  // This method does not fire when refreshing the page
+  content::WebUIDataSource* source =
+      content::WebUIDataSource::Create(chrome::kChromeUIInvalidationsHost);
+  source->AddResourcePath("about_invalidations.js", IDR_ABOUT_INVALIDATIONS_JS);
+  source->SetDefaultResource(IDR_ABOUT_INVALIDATIONS_HTML);
+  return source;
+}
+
+InvalidationsUI::InvalidationsUI(content::WebUI* web_ui)
+    : WebUIController(web_ui) {
+  Profile* profile = Profile::FromWebUI(web_ui);
+  if (profile) {
+    content::WebUIDataSource::Add(profile, CreateInvalidationsHTMLSource());
+  }
+}
+
+InvalidationsUI::~InvalidationsUI() { }
diff --git a/chrome/browser/ui/webui/invalidations_ui.h b/chrome/browser/ui/webui/invalidations_ui.h
@@ -0,0 +1,22 @@
+// Copyright 2014 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.
+
+#ifndef CHROME_BROWSER_UI_WEBUI_INVALIDATIONS_UI_H_
+#define CHROME_BROWSER_UI_WEBUI_INVALIDATIONS_UI_H_
+
+#include "base/basictypes.h"
+#include "base/compiler_specific.h"
+#include "content/public/browser/web_ui_controller.h"
+
+// The implementation for the chrome://invalidations page.
+class InvalidationsUI : public content::WebUIController {
+ public:
+  explicit InvalidationsUI(content::WebUI* web_ui);
+  virtual ~InvalidationsUI();
+
+ private:
+  DISALLOW_COPY_AND_ASSIGN(InvalidationsUI);
+};
+
+#endif  // CHROME_BROWSER_UI_WEBUI_INVALIDATIONS_UI_H_
diff --git a/chrome/chrome_browser_ui.gypi b/chrome/chrome_browser_ui.gypi
@@ -2371,6 +2371,8 @@
         'browser/ui/webui/inspect_ui.h',
         'browser/ui/webui/instant_ui.cc',
         'browser/ui/webui/instant_ui.h',
+        'browser/ui/webui/invalidations_ui.cc',
+        'browser/ui/webui/invalidations_ui.h',
         'browser/ui/webui/media/webrtc_logs_ui.cc',
         'browser/ui/webui/media/webrtc_logs_ui.h',
         'browser/ui/webui/memory_internals/memory_internals_handler.cc',

diff --git a/chrome/chrome_repack_resources.gypi b/chrome/chrome_repack_resources.gypi
@@ -11,6 +11,7 @@
       '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/webui_resources.pak',
       '<(grit_out_dir)/browser_resources.pak',
       '<(grit_out_dir)/common_resources.pak',
+      '<(grit_out_dir)/invalidations_resources.pak',
       '<(grit_out_dir)/memory_internals_resources.pak',
       '<(grit_out_dir)/net_internals_resources.pak',
       '<(grit_out_dir)/signin_internals_resources.pak',

diff --git a/chrome/chrome_resources.gyp b/chrome/chrome_resources.gyp
@@ -30,6 +30,13 @@
           },
           'includes': [ '../build/grit_action.gypi' ],
         },
+	{
+          'action_name': 'invalidations_resources',
+          'variables': {
+            'grit_grd_file': 'browser/resources/invalidations_resources.grd',
+            },
+          'includes': ['../build/grit_action.gypi' ],
+        },
         {
           'action_name': 'signin_internals_resources',
           'variables': {

diff --git a/chrome/common/url_constants.cc b/chrome/common/url_constants.cc
@@ -52,6 +52,7 @@ const char kChromeUIHistoryFrameURL[] = "chrome://history-frame/";
 const char kChromeUIIdentityInternalsURL[] = "chrome://identity-internals/";
 const char kChromeUIInspectURL[] = "chrome://inspect/";
 const char kChromeUIInstantURL[] = "chrome://instant/";
+const char kChromeUIInvalidationsURL[] = "chrome://invalidations/";
 const char kChromeUIIPCURL[] = "chrome://ipc/";
 const char kChromeUIManagedUserPassphrasePageURL[] =
     "chrome://managed-user-passphrase/";
@@ -180,6 +181,7 @@ const char kChromeUIHistoryFrameHost[] = "history-frame";
 const char kChromeUIIdentityInternalsHost[] = "identity-internals";
 const char kChromeUIInspectHost[] = "inspect";
 const char kChromeUIInstantHost[] = "instant";
+const char kChromeUIInvalidationsHost[] = "invalidations";
 const char kChromeUIIPCHost[] = "ipc";
 const char kChromeUIKillHost[] = "kill";
 const char kChromeUIManagedUserPassphrasePageHost[] = "managed-user-passphrase";
@@ -548,6 +550,7 @@ const char* const kChromeHostURLs[] = {
   kChromeUIFlagsHost,
   kChromeUIHelpHost,
   kChromeUIHistoryHost,
+  kChromeUIInvalidationsHost,
   kChromeUIIPCHost,
   kChromeUIMemoryHost,
   kChromeUIMemoryInternalsHost,

diff --git a/chrome/common/url_constants.h b/chrome/common/url_constants.h
@@ -48,6 +48,7 @@ extern const char kChromeUIHistoryFrameURL[];
 extern const char kChromeUIIdentityInternalsURL[];
 extern const char kChromeUIInspectURL[];
 extern const char kChromeUIInstantURL[];
+extern const char kChromeUIInvalidationsURL[];
 extern const char kChromeUIIPCURL[];
 extern const char kChromeUIManagedUserPassphrasePageURL[];
 extern const char kChromeUIMemoryRedirectURL[];
@@ -172,6 +173,7 @@ extern const char kChromeUIHistoryFrameHost[];
 extern const char kChromeUIIdentityInternalsHost[];
 extern const char kChromeUIInspectHost[];
 extern const char kChromeUIInstantHost[];
+extern const char kChromeUIInvalidationsHost[];
 extern const char kChromeUIIPCHost[];
 extern const char kChromeUIKillHost[];
 extern const char kChromeUIManagedUserPassphrasePageHost[];

diff --git a/chrome/test/functional/special_tabs.py b/chrome/test/functional/special_tabs.py
@@ -50,6 +50,7 @@ def GetSpecialAcceleratorTabs():
     'chrome://flags': {},
     'chrome://flash': {},
     'chrome://gpu-internals': {},
+    'chrome://invalidations': { 'title': 'Invalidations' },
     'chrome://histograms': { 'title': 'About Histograms' },
     'chrome://history': { 'title': 'History' },
     'chrome://inspect': { 'title': 'Inspect with Chrome Developer Tools' },

diff --git a/tools/gritsettings/resource_ids b/tools/gritsettings/resource_ids
@@ -121,6 +121,9 @@
   "chrome/browser/resources/signin_internals_resources.grd": {
     "includes": [21750],
   },
+  "chrome/browser/resources/invalidations_resources.grd": {
+    "includes": [21950],
+  },
   # This file is generated during the build.
   "<(SHARED_INTERMEDIATE_DIR)/devtools/devtools_resources.grd": {
     "includes": [22000],