Implement constrained window for TOUCH_UI.

Original CL: http://codereview.chromium.org/7631049
landing for rhashimoto@chromium.org who left google.
Sync'ed to TOT and fixed keyboard issue.

BUG=chromium-os:13900,97862
TEST=see original bug

Review URL: http://codereview.chromium.org/8055030

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@103072 0039d316-1c4b-4281-b951-d872f2087c98

10 files changed, 152 insertions, 31 deletions

diff --git a/chrome/browser/browser_resources.grd b/chrome/browser/browser_resources.grd
index e9d3891..c06a74c 100644
--- a/chrome/browser/browser_resources.grd
+++ b/chrome/browser/browser_resources.grd
@@ -119,10 +119,8 @@
         <include name="IDR_ABOUT_SYS_HTML" file="resources\about_sys.html" flattenhtml="true" type="BINDATA" />
         <include name="IDR_ACTIVE_DOWNLOADS_HTML" file="resources\active_downloads.html" flattenhtml="true" type="BINDATA" />
         <include name="IDR_CHOOSE_MOBILE_NETWORK_HTML" file="resources\chromeos\choose_mobile_network.html" flattenhtml="true" type="BINDATA" />
-        <include name="IDR_COLLECTED_COOKIES_HTML" file="resources\collected_cookies.html" flattenhtml="true" type="BINDATA" />
         <include name="IDR_GUEST_SESSION_TAB_HTML" file="resources\guest_session_tab.html" flattenhtml="true" type="BINDATA" />
         <include name="IDR_HOST_REGISTRATION_PAGE_HTML" file="resources\host_registration_page.html" flattenhtml="true" type="BINDATA" />
-        <include name="IDR_HTTP_AUTH_HTML" file="resources\http_auth.html" flattenhtml="true" type="BINDATA" />
         <include name="IDR_IMAGEBURNER_HTML" file="resources\image_burner.html" flattenhtml="true" type="BINDATA" />
         <include name="IDR_KEYBOARD_OVERLAY_CSS" file="resources\keyboard_overlay.css" flattenhtml="true" type="BINDATA" />
         <include name="IDR_KEYBOARD_OVERLAY_DATA_JS" file="resources\keyboard_overlay_data.js" flattenhtml="true" type="BINDATA" />
@@ -139,7 +137,6 @@
         <include name="IDR_OOBE_HTML" file="resources\chromeos\login\oobe.html" flattenhtml="true" type="BINDATA" />
         <include name="IDR_OS_CREDITS_HTML" file="resources\about_os_credits.html" flattenhtml="true" type="BINDATA" />
         <include name="IDR_PROXY_SETTINGS_HTML" file="resources\chromeos\proxy_settings.html" flattenhtml="true" type="BINDATA" />
-        <include name="IDR_REPOST_FORM_WARNING_HTML" file="resources\repost_form_warning.html" flattenhtml="true" type="BINDATA" />
         <include name="IDR_SIM_UNLOCK_HTML" file="resources\chromeos\sim_unlock.html" flattenhtml="true" type="BINDATA" />
         <include name="IDR_WRENCH_MENU_CSS" file="resources\wrench_menu.css" flattenhtml="true" type="BINDATA" />
         <include name="IDR_WRENCH_MENU_JS" file="resources\wrench_menu.js" flattenhtml="true" type="BINDATA" />
@@ -153,6 +150,11 @@
       <if expr="pp_ifdef('file_manager_extension')">
         <include name="IDR_FILEMANAGER_MANIFEST" file="resources\file_manager\manifest.json" type="BINDATA" />
       </if>
+      <if expr="pp_ifdef('chromeos') or pp_ifdef('touchui')">
+        <include name="IDR_COLLECTED_COOKIES_HTML" file="resources\collected_cookies.html" flattenhtml="true" type="BINDATA" />
+        <include name="IDR_HTTP_AUTH_HTML" file="resources\http_auth.html" flattenhtml="true" type="BINDATA" />
+        <include name="IDR_REPOST_FORM_WARNING_HTML" file="resources\repost_form_warning.html" flattenhtml="true" type="BINDATA" />
+      </if>
       <if expr="pp_ifdef('chromeos') and pp_ifdef('_google_chrome')">
         <include name="IDR_HELP_MANIFEST" file="resources\help_app\manifest.json" type="BINDATA" />
       </if>
diff --git a/chrome/browser/renderer_host/render_widget_host_view_views.cc b/chrome/browser/renderer_host/render_widget_host_view_views.cc
index 4634100..ec6f3ea 100644
--- a/chrome/browser/renderer_host/render_widget_host_view_views.cc
+++ b/chrome/browser/renderer_host/render_widget_host_view_views.cc
@@ -969,6 +969,14 @@ bool RenderWidgetHostViewViews::IsReadyToPaint() {
         GetWidget();
   } else {
     top = GetWidget() ? GetWidget()->GetTopLevelWidget() : NULL;
+    // The conversion of the Widget to NativeView and back again
+    // ensures that the result is backed by a NativeWidgetGtk (and not
+    // a NativeWidgetViews, for example) so the subsequent cast is
+    // valid.
+    top = GetWidget() ?
+        views::Widget::GetWidgetForNativeView(
+            GetWidget()->GetTopLevelWidget()->GetNativeView()) :
+        NULL;
   }
 
   return top ?
diff --git a/chrome/browser/tab_contents/tab_contents_ssl_helper.cc b/chrome/browser/tab_contents/tab_contents_ssl_helper.cc
index f96d1e4..317e4b5 100644
--- a/chrome/browser/tab_contents/tab_contents_ssl_helper.cc
+++ b/chrome/browser/tab_contents/tab_contents_ssl_helper.cc
@@ -246,8 +246,11 @@ void TabContentsSSLHelper::SelectClientCertificate(
 
 void TabContentsSSLHelper::ShowClientCertificateRequestDialog(
     scoped_refptr<SSLClientAuthHandler> handler) {
+  // TODO(rhashimoto): WebUI certificate selector for touch.
+#if !defined(TOUCH_UI)
   browser::ShowSSLClientCertificateSelector(
       tab_contents_, handler->cert_request_info(), handler);
+#endif
 }
 
 void TabContentsSSLHelper::OnVerifyClientCertificateError(
diff --git a/chrome/browser/ui/views/constrained_window_views.cc b/chrome/browser/ui/views/constrained_window_views.cc
index 47e8724..f6dc2f3 100644
--- a/chrome/browser/ui/views/constrained_window_views.cc
+++ b/chrome/browser/ui/views/constrained_window_views.cc
@@ -6,10 +6,12 @@
 
 #include <algorithm>
 
+#include "base/utf_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/toolbar/toolbar_model.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
+#include "chrome/browser/ui/views/tab_contents/tab_contents_view_views.h"
 #include "chrome/browser/ui/window_sizer.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_notification_types.h"
@@ -29,12 +31,17 @@
 #include "ui/gfx/rect.h"
 #include "views/controls/button/image_button.h"
 #include "views/focus/focus_manager.h"
+#include "views/views_delegate.h"
 #include "views/widget/widget.h"
 #include "views/window/client_view.h"
 #include "views/window/non_client_view.h"
 #include "views/window/window_resources.h"
 #include "views/window/window_shape.h"
 
+#if defined(OS_LINUX)
+#include "views/window/hit_test.h"
+#endif
+
 #if defined(OS_WIN) && !defined(USE_AURA)
 #include "views/widget/native_widget_win.h"
 #endif
@@ -228,12 +235,12 @@ class ConstrainedWindowFrameView
   static void InitClass();
 
   // The font to be used to render the titlebar text.
-  static gfx::Font* title_font_;
+  static const gfx::Font* title_font_;
 
   DISALLOW_COPY_AND_ASSIGN(ConstrainedWindowFrameView);
 };
 
-gfx::Font* ConstrainedWindowFrameView::title_font_ = NULL;
+const gfx::Font* ConstrainedWindowFrameView::title_font_ = NULL;
 
 namespace {
 // The frame border is only visible in restored mode and is hardcoded to 4 px on
@@ -400,7 +407,7 @@ int ConstrainedWindowFrameView::IconSize() const {
   // size are increased.
   return GetSystemMetrics(SM_CYSMICON);
 #else
-  return std::max(title_font_->height(), kIconMinimumSize);
+  return std::max(title_font_->GetHeight(), kIconMinimumSize);
 #endif
 }
 
@@ -489,7 +496,7 @@ void ConstrainedWindowFrameView::PaintFrameBorder(gfx::Canvas* canvas) {
 
 void ConstrainedWindowFrameView::PaintTitleBar(gfx::Canvas* canvas) {
   canvas->DrawStringInt(
-      container_->widget_delegate()->GetWindowTitle(),
+      WideToUTF16Hack(container_->widget_delegate()->GetWindowTitle()),
       *title_font_, GetTitleColor(), GetMirroredXForRect(title_bounds_),
       title_bounds_.y(), title_bounds_.width(), title_bounds_.height());
 }
@@ -546,9 +553,16 @@ gfx::Rect ConstrainedWindowFrameView::CalculateClientAreaBounds(
 
 void ConstrainedWindowFrameView::InitWindowResources() {
 #if !defined(USE_AURA)
+
+#if defined(OS_WIN)
   resources_.reset(views::NativeWidgetWin::IsAeroGlassEnabled() ?
       static_cast<views::WindowResources*>(new VistaWindowResources) :
       new XPWindowResources);
+#else
+  // TODO(rhashimoto): Use non-Windows frame decoration.
+  resources_.reset(new XPWindowResources);
+#endif
+
 #endif
 }
 
@@ -562,6 +576,9 @@ void ConstrainedWindowFrameView::InitClass() {
     // TODO(beng):
     NOTIMPLEMENTED();
     title_font_ = NULL;
+#else
+    ResourceBundle& resources = ResourceBundle::GetSharedInstance();
+    title_font_ = &resources.GetFont(ResourceBundle::MediumFont);
 #endif
     initialized = true;
   }
@@ -578,9 +595,24 @@ ConstrainedWindowViews::ConstrainedWindowViews(
           NativeConstrainedWindow::CreateNativeConstrainedWindow(this))) {
   views::Widget::InitParams params;
   params.delegate = widget_delegate;
-  params.child = true;
-  params.parent = owner->GetNativeView();
   params.native_widget = native_constrained_window_->AsNativeWidget();
+
+  if (views::Widget::IsPureViews()) {
+    if (views::ViewsDelegate::views_delegate &&
+        views::ViewsDelegate::views_delegate->GetDefaultParentView()) {
+      // Don't set parent so that constrained window is attached to
+      // desktop. This is necessary for key events to work under views desktop
+      // because key events need to be sent to toplevel window
+      // which has an inputmethod object that knows where to forward
+      // event.
+    } else {
+      params.parent_widget = static_cast<TabContentsViewViews*>(owner->view());
+    }
+  } else {
+    params.child = true;
+    params.parent = owner->GetNativeView();
+  }
+
   Init(params);
   owner->AddConstrainedDialog(this);
 }
@@ -602,6 +634,7 @@ void ConstrainedWindowViews::ShowConstrainedWindow() {
 }
 
 void ConstrainedWindowViews::CloseConstrainedWindow() {
+  owner_->WillClose(this);
   Close();
 }
 
diff --git a/chrome/browser/ui/views/dialog_stubs_gtk.cc b/chrome/browser/ui/views/dialog_stubs_gtk.cc
index 8b95c94..2880952 100644
--- a/chrome/browser/ui/views/dialog_stubs_gtk.cc
+++ b/chrome/browser/ui/views/dialog_stubs_gtk.cc
@@ -17,7 +17,7 @@
 #include "chrome/browser/ui/gtk/task_manager_gtk.h"
 #endif
 
-#if !defined(OS_CHROMEOS)
+#if !defined(OS_CHROMEOS) && !defined(TOUCH_UI)
 #include "chrome/browser/ui/gtk/collected_cookies_gtk.h"
 #include "chrome/browser/ui/gtk/repost_form_warning_gtk.h"
 #endif
@@ -41,7 +41,7 @@ void EditSearchEngine(gfx::NativeWindow parent,
   new EditSearchEngineDialog(GTK_WINDOW(parent), template_url, NULL, profile);
 }
 
-#if !defined(OS_CHROMEOS)
+#if !defined(OS_CHROMEOS) && !defined(TOUCH_UI)
 void ShowRepostFormWarningDialog(gfx::NativeWindow parent_window,
                                  TabContents* tab_contents) {
   new RepostFormWarningGtk(GTK_WINDOW(parent_window), tab_contents);
diff --git a/chrome/browser/ui/views/native_constrained_window_views.cc b/chrome/browser/ui/views/native_constrained_window_views.cc
new file mode 100644
index 0000000..cf7b671
--- /dev/null
+++ b/chrome/browser/ui/views/native_constrained_window_views.cc
@@ -0,0 +1,39 @@
+// Copyright (c) 2011 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/views/constrained_window_views.h"
+
+#include "views/widget/native_widget_views.h"
+
+class NativeConstrainedWindowViews : public NativeConstrainedWindow,
+                                     public views::NativeWidgetViews {
+ public:
+  explicit NativeConstrainedWindowViews(
+      NativeConstrainedWindowDelegate* delegate)
+      : views::NativeWidgetViews(delegate->AsNativeWidgetDelegate()),
+        delegate_(delegate) {
+  }
+
+  virtual ~NativeConstrainedWindowViews() {
+  }
+
+ private:
+  // Overridden from NativeConstrainedWindow:
+  virtual views::NativeWidget* AsNativeWidget() OVERRIDE {
+    return this;
+  }
+
+  NativeConstrainedWindowDelegate* delegate_;
+
+  DISALLOW_COPY_AND_ASSIGN(NativeConstrainedWindowViews);
+};
+
+////////////////////////////////////////////////////////////////////////////////
+// NativeConstrainedWindow, public:
+
+// static
+NativeConstrainedWindow* NativeConstrainedWindow::CreateNativeConstrainedWindow(
+    NativeConstrainedWindowDelegate* delegate) {
+  return new NativeConstrainedWindowViews(delegate);
+}
diff --git a/chrome/browser/ui/webui/chrome_web_ui_factory.cc b/chrome/browser/ui/webui/chrome_web_ui_factory.cc
index 73f1599..64a0450 100644
--- a/chrome/browser/ui/webui/chrome_web_ui_factory.cc
+++ b/chrome/browser/ui/webui/chrome_web_ui_factory.cc
@@ -207,11 +207,6 @@ static WebUIFactoryFunction GetWebUIFactoryFunction(Profile* profile,
 #if defined(OS_CHROMEOS)
   if (url.host() == chrome::kChromeUIChooseMobileNetworkHost)
     return &NewWebUI<chromeos::ChooseMobileNetworkUI>;
-  if (url.host() == chrome::kChromeUICollectedCookiesHost ||
-      url.host() == chrome::kChromeUIHttpAuthHost ||
-      url.host() == chrome::kChromeUIRepostFormWarningHost) {
-    return &NewWebUI<ConstrainedHtmlUI>;
-  }
   if (url.host() == chrome::kChromeUIActiveDownloadsHost)
     return &NewWebUI<ActiveDownloadsUI>;
   if (url.host() == chrome::kChromeUIImageBurnerHost)
@@ -234,6 +229,14 @@ static WebUIFactoryFunction GetWebUIFactoryFunction(Profile* profile,
     return &NewWebUI<chromeos::EnterpriseEnrollmentUI>;
 #endif  // defined(OS_CHROMEOS)
 
+#if defined(OS_CHROMEOS) || defined(TOUCH_UI)
+  if (url.host() == chrome::kChromeUICollectedCookiesHost ||
+      url.host() == chrome::kChromeUIHttpAuthHost ||
+      url.host() == chrome::kChromeUIRepostFormWarningHost) {
+    return &NewWebUI<ConstrainedHtmlUI>;
+  }
+#endif
+
   if (url.host() == chrome::kChromeUIPrintHost &&
       switches::IsPrintPreviewEnabled()) {
     return &NewWebUI<PrintPreviewUI>;
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index 5123f33..349b3a5 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -3388,6 +3388,7 @@
         'browser/ui/views/login_view.cc',
         'browser/ui/views/login_view.h',
         'browser/ui/views/native_constrained_window_aura.cc',
+        'browser/ui/views/native_constrained_window_views.cc',
         'browser/ui/views/native_constrained_window_win.cc',
         'browser/ui/views/notifications/balloon_view.cc',
         'browser/ui/views/notifications/balloon_view.h',
@@ -4395,6 +4396,7 @@
             'browser/ui/panels/panel_mouse_watcher_timer.cc',
             'browser/ui/views/keyboard_overlay_delegate.cc',
             'browser/ui/views/keyboard_overlay_dialog_view.cc',
+            'browser/ui/views/native_constrained_window_views.cc',
             'browser/ui/views/select_file_dialog.cc',
             'browser/ui/views/simple_message_box_views.cc',
             'browser/ui/views/simple_message_box_views.h',
@@ -4829,11 +4831,30 @@
             # Touch build only
             ['OS=="linux" and toolkit_views==1 and touchui==1', {
               'sources/': [
+                ['include', '^browser/ui/login/login_prompt_ui.cc'],
+                ['include', '^browser/ui/views/constrained_html_delegate_views.cc'],
+                ['include', '^browser/ui/views/constrained_window_views.cc'],
+                ['include', '^browser/ui/views/constrained_window_views.h'],
+                ['include', '^browser/ui/views/constrained_html_delegate_views.cc'],
+                ['include', '^browser/ui/views/constrained_window_views.cc'],
+                ['include', '^browser/ui/views/constrained_window_views.h'],
+                ['include', '^browser/ui/views/native_constrained_window_views.cc'],
                 ['include', '^browser/ui/views/tab_contents/tab_contents_container_views.cc'],
                 ['include', '^browser/ui/views/tab_contents/tab_contents_container_views.h'],
-                # TODO(anicolao): exclude these once we have WebUI dialogs
-                # ['exclude', '^browser/ui/gtk/constrained_window_gtk.cc'],
-                # ['exclude', '^browser/ui/gtk/constrained_window_gtk.h'],
+                ['include', '^browser/ui/webui/collected_cookies_ui_delegate.cc'],
+                ['include', '^browser/ui/webui/collected_cookies_ui_delegate.h'],
+                ['include', '^browser/ui/webui/cookies_tree_model_adapter.cc'],
+                ['include', '^browser/ui/webui/cookies_tree_model_adapter.h'],
+                ['include', '^browser/ui/webui/repost_form_warning_ui.cc'],
+                ['include', '^browser/ui/webui/repost_form_warning_ui.h'],
+                ['exclude', '^browser/ui/gtk/collected_cookies_gtk.cc'],
+                ['exclude', '^browser/ui/gtk/constrained_window_gtk.cc'],
+                ['exclude', '^browser/ui/gtk/constrained_window_gtk.h'],
+                ['exclude', '^browser/ui/gtk/repost_form_warning_gtk.cc'],
+                ['exclude', '^browser/ui/gtk/repost_form_warning_gtk.h'],
+                ['exclude', '^browser/ui/gtk/ssl_client_certificate_selector.cc'],
+                ['exclude', '^browser/ui/login/login_prompt_gtk.cc'],
+                ['exclude', '^browser/ui/views/constrained_html_delegate_gtk.cc'],
                 ['exclude', '^browser/ui/views/frame/browser_non_client_frame_view_factory_gtk.cc'],
                 ['exclude', '^browser/ui/views/tabs/tab_strip_factory.cc'],
                 ['exclude', '^browser/ui/views/tab_contents/native_tab_contents_view_gtk.*'],
diff --git a/chrome/common/url_constants.cc b/chrome/common/url_constants.cc
index 122aefe..5bcb3359 100644
--- a/chrome/common/url_constants.cc
+++ b/chrome/common/url_constants.cc
@@ -68,11 +68,9 @@ const char kChromeUIActivationMessage[] = "chrome://activationmessage/";
 const char kChromeUIActiveDownloadsURL[] = "chrome://active-downloads/";
 const char kChromeUIChooseMobileNetworkURL[] =
     "chrome://choose-mobile-network/";
-const char kChromeUICollectedCookiesURL[] = "chrome://collected-cookies/";
 const char kChromeUIDiscardsURL[] = "chrome://discards/";
 const char kChromeUIEnterpriseEnrollmentURL[] =
     "chrome://enterprise-enrollment/";
-const char kChromeUIHttpAuthURL[] = "chrome://http-auth/";
 const char kChromeUIImageBurnerURL[] = "chrome://imageburner/";
 const char kChromeUIKeyboardOverlayURL[] = "chrome://keyboardoverlay/";
 const char kChromeUIMediaplayerURL[] = "chrome://mediaplayer/";
@@ -81,7 +79,6 @@ const char kChromeUIOSCreditsURL[] = "chrome://os-credits/";
 const char kChromeUIOobeURL[] = "chrome://oobe/";
 const char kChromeUIProxySettingsURL[] = "chrome://proxy-settings/";
 const char kChromeUIRegisterPageURL[] = "chrome://register/";
-const char kChromeUIRepostFormWarningURL[] = "chrome://repost-form-warning/";
 const char kChromeUISimUnlockURL[] = "chrome://sim-unlock/";
 const char kChromeUISlideshowURL[] = "chrome://slideshow/";
 const char kChromeUISystemInfoURL[] = "chrome://system/";
@@ -93,6 +90,12 @@ const char kChromeUIUserImageURL[] = "chrome://userimage/";
 const char kChromeUIFileManagerURL[] = "chrome://files/";
 #endif
 
+#if defined(OS_CHROMEOS) || defined(TOUCH_UI)
+const char kChromeUICollectedCookiesURL[] = "chrome://collected-cookies/";
+const char kChromeUIHttpAuthURL[] = "chrome://http-auth/";
+const char kChromeUIRepostFormWarningURL[] = "chrome://repost-form-warning/";
+#endif
+
 // Add Chrome UI hosts here, in alphabetical order.
 // Add hosts to kChromePaths in browser_about_handler.cc to be listed by
 // chrome://chrome-urls (about:about) and the built-in AutocompleteProvider.
@@ -176,11 +179,9 @@ const char kChromeUISandboxHost[] = "sandbox";
 const char kChromeUIActivationMessageHost[] = "activationmessage";
 const char kChromeUIActiveDownloadsHost[] = "active-downloads";
 const char kChromeUIChooseMobileNetworkHost[] = "choose-mobile-network";
-const char kChromeUICollectedCookiesHost[] = "collected-cookies";
 const char kChromeUICryptohomeHost[] = "cryptohome";
 const char kChromeUIDiscardsHost[] = "discards";
 const char kChromeUIEnterpriseEnrollmentHost[] = "enterprise-enrollment";
-const char kChromeUIHttpAuthHost[] = "http-auth";
 const char kChromeUIImageBurnerHost[] = "imageburner";
 const char kChromeUIKeyboardOverlayHost[] = "keyboardoverlay";
 const char kChromeUILoginContainerHost[] = "login-container";
@@ -192,7 +193,6 @@ const char kChromeUIOSCreditsHost[] = "os-credits";
 const char kChromeUIOobeHost[] = "oobe";
 const char kChromeUIProxySettingsHost[] = "proxy-settings";
 const char kChromeUIRegisterPageHost[] = "register";
-const char kChromeUIRepostFormWarningHost[] = "repost-form-warning";
 const char kChromeUIRotateHost[] = "rotate";
 const char kChromeUISlideshowHost[] = "slideshow";
 const char kChromeUISimUnlockHost[] = "sim-unlock";
@@ -211,6 +211,12 @@ const char kOemEulaURLPath[] = "oem";
 const char kChromeUIFileManagerHost[] = "files";
 #endif
 
+#if defined(OS_CHROMEOS) || defined(TOUCH_UI)
+const char kChromeUICollectedCookiesHost[] = "collected-cookies";
+const char kChromeUIHttpAuthHost[] = "http-auth";
+const char kChromeUIRepostFormWarningHost[] = "repost-form-warning";
+#endif
+
 // Option sub pages.
 // Add sub page paths to kChromeSettingsSubPages in builtin_provider.cc to be
 // listed by the built-in AutocompleteProvider.
diff --git a/chrome/common/url_constants.h b/chrome/common/url_constants.h
index ee39535..8947470 100644
--- a/chrome/common/url_constants.h
+++ b/chrome/common/url_constants.h
@@ -69,10 +69,8 @@ extern const char kChromeUIWorkersURL[];
 extern const char kChromeUIActivationMessage[];
 extern const char kChromeUIActiveDownloadsURL[];
 extern const char kChromeUIChooseMobileNetworkURL[];
-extern const char kChromeUICollectedCookiesURL[];
 extern const char kChromeUIDiscardsURL[];
 extern const char kChromeUIEnterpriseEnrollmentURL[];
-extern const char kChromeUIHttpAuthURL[];
 extern const char kChromeUIImageBurnerURL[];
 extern const char kChromeUIKeyboardOverlayURL[];
 extern const char kChromeUIMediaplayerURL[];
@@ -81,7 +79,6 @@ extern const char kChromeUIOSCreditsURL[];
 extern const char kChromeUIOobeURL[];
 extern const char kChromeUIProxySettingsURL[];
 extern const char kChromeUIRegisterPageURL[];
-extern const char kChromeUIRepostFormWarningURL[];
 extern const char kChromeUISimUnlockURL[];
 extern const char kChromeUISlideshowURL[];
 extern const char kChromeUISystemInfoURL[];
@@ -93,6 +90,12 @@ extern const char kChromeUIUserImageURL[];
 extern const char kChromeUIFileManagerURL[];
 #endif
 
+#if defined(OS_CHROMEOS) || defined(TOUCH_UI)
+extern const char kChromeUICollectedCookiesURL[];
+extern const char kChromeUIHttpAuthURL[];
+extern const char kChromeUIRepostFormWarningURL[];
+#endif
+
 // chrome components of URLs. Should be kept in sync with the full URLs above.
 extern const char kChromeUIAboutHost[];
 extern const char kChromeUIAppCacheInternalsHost[];
@@ -174,11 +177,9 @@ extern const char kChromeUISandboxHost[];
 extern const char kChromeUIActivationMessageHost[];
 extern const char kChromeUIActiveDownloadsHost[];
 extern const char kChromeUIChooseMobileNetworkHost[];
-extern const char kChromeUICollectedCookiesHost[];
 extern const char kChromeUICryptohomeHost[];
 extern const char kChromeUIDiscardsHost[];
 extern const char kChromeUIEnterpriseEnrollmentHost[];
-extern const char kChromeUIHttpAuthHost[];
 extern const char kChromeUIImageBurnerHost[];
 extern const char kChromeUIKeyboardOverlayHost[];
 extern const char kChromeUILoginContainerHost[];
@@ -190,7 +191,6 @@ extern const char kChromeUIOSCreditsHost[];
 extern const char kChromeUIOobeHost[];
 extern const char kChromeUIProxySettingsHost[];
 extern const char kChromeUIRegisterPageHost[];
-extern const char kChromeUIRepostFormWarningHost[];
 extern const char kChromeUIRotateHost[];
 extern const char kChromeUISimUnlockHost[];
 extern const char kChromeUISlideshowHost[];
@@ -209,6 +209,12 @@ extern const char kOemEulaURLPath[];
 extern const char kChromeUIFileManagerHost[];
 #endif
 
+#if defined(OS_CHROMEOS) || defined(TOUCH_UI)
+extern const char kChromeUICollectedCookiesHost[];
+extern const char kChromeUIHttpAuthHost[];
+extern const char kChromeUIRepostFormWarningHost[];
+#endif
+
 // Options sub-pages.
 extern const char kAdvancedOptionsSubPage[];
 extern const char kAutofillSubPage[];