Merge Chromium at r11.0.696.0: Initial merge by git

Change-Id: I273dde2843af0839dfc08b419bb443fbd449532d

6 files changed, 18 insertions, 13 deletions

diff --git a/chrome/browser/remoting/remoting_options_handler.cc b/chrome/browser/remoting/remoting_options_handler.cc
index 02ebac6..9c8b735 100644
--- a/chrome/browser/remoting/remoting_options_handler.cc
+++ b/chrome/browser/remoting/remoting_options_handler.cc
@@ -6,9 +6,9 @@
 
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
-#include "chrome/common/remoting/chromoting_host_info.h"
-#include "chrome/browser/dom_ui/web_ui.h"
 #include "chrome/browser/service/service_process_control_manager.h"
+#include "chrome/common/remoting/chromoting_host_info.h"
+#include "content/browser/webui/web_ui.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 
diff --git a/chrome/browser/remoting/remoting_resources_source.h b/chrome/browser/remoting/remoting_resources_source.h
index 4d73d8e..83d8943 100644
--- a/chrome/browser/remoting/remoting_resources_source.h
+++ b/chrome/browser/remoting/remoting_resources_source.h
@@ -1,9 +1,12 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// 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.
 
+#ifndef CHROME_BROWSER_REMOTING_REMOTING_RESOURCES_SOURCE_H_
+#define CHROME_BROWSER_REMOTING_REMOTING_RESOURCES_SOURCE_H_
+
 #include "base/message_loop.h"
-#include "chrome/browser/dom_ui/chrome_url_data_manager.h"
+#include "chrome/browser/ui/webui/chrome_url_data_manager.h"
 #include "chrome/common/url_constants.h"
 
 class RemotingResourcesSource : public ChromeURLDataManager::DataSource {
@@ -29,3 +32,5 @@ class RemotingResourcesSource : public ChromeURLDataManager::DataSource {
 
   DISALLOW_COPY_AND_ASSIGN(RemotingResourcesSource);
 };
+
+#endif  // CHROME_BROWSER_REMOTING_REMOTING_RESOURCES_SOURCE_H_
diff --git a/chrome/browser/remoting/resources/remoting_setting_up.html b/chrome/browser/remoting/resources/remoting_setting_up.html
index c0a20a8..df6debf 100644
--- a/chrome/browser/remoting/resources/remoting_setting_up.html
+++ b/chrome/browser/remoting/resources/remoting_setting_up.html
@@ -7,7 +7,7 @@
   margin: -3px 10px;
 }
 #setting_up {
-  margin: 100px;
+  margin: 60px;
   text-align: center;
 }
 #setting_up_label {
diff --git a/chrome/browser/remoting/setup_flow.cc b/chrome/browser/remoting/setup_flow.cc
index dc7effd..74c9540 100644
--- a/chrome/browser/remoting/setup_flow.cc
+++ b/chrome/browser/remoting/setup_flow.cc
@@ -8,16 +8,16 @@
 #include "base/json/json_writer.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
-#include "chrome/browser/browser_thread.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/remoting/remoting_resources_source.h"
 #include "chrome/browser/remoting/setup_flow_login_step.h"
-#include "chrome/browser/renderer_host/render_view_host.h"
-#include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/common/pref_names.h"
+#include "content/browser/browser_thread.h"
+#include "content/browser/renderer_host/render_view_host.h"
+#include "content/browser/tab_contents/tab_contents.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
 #include "ui/base/l10n/l10n_font_util.h"
@@ -171,8 +171,8 @@ void SetupFlow::GetDialogSize(gfx::Size* size) const {
 
   // TODO(pranavk) Replace the following SYNC resources with REMOTING Resources.
   *size = ui::GetLocalizedContentsSizeForFont(
-      IDS_SYNC_SETUP_WIZARD_WIDTH_CHARS,
-      IDS_SYNC_SETUP_WIZARD_HEIGHT_LINES,
+      IDS_REMOTING_SETUP_WIZARD_WIDTH_CHARS,
+      IDS_REMOTING_SETUP_WIZARD_HEIGHT_LINES,
       approximate_web_font);
 }
 
diff --git a/chrome/browser/remoting/setup_flow.h b/chrome/browser/remoting/setup_flow.h
index b8a7de6..6dd31cc 100644
--- a/chrome/browser/remoting/setup_flow.h
+++ b/chrome/browser/remoting/setup_flow.h
@@ -7,9 +7,9 @@
 
 #include "base/callback.h"
 #include "base/scoped_ptr.h"
-#include "chrome/browser/dom_ui/html_dialog_ui.h"
-#include "chrome/browser/dom_ui/web_ui.h"
+#include "chrome/browser/ui/webui/html_dialog_ui.h"
 #include "chrome/common/remoting/chromoting_host_info.h"
+#include "content/browser/webui/web_ui.h"
 
 class ListValue;
 class ServiceProcessControl;
diff --git a/chrome/browser/remoting/setup_flow_login_step.cc b/chrome/browser/remoting/setup_flow_login_step.cc
index 6170198..e58c674 100644
--- a/chrome/browser/remoting/setup_flow_login_step.cc
+++ b/chrome/browser/remoting/setup_flow_login_step.cc
@@ -9,11 +9,11 @@
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
-#include "chrome/browser/dom_ui/web_ui_util.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/remoting/setup_flow_get_status_step.h"
 #include "chrome/common/net/gaia/gaia_constants.h"
 #include "chrome/common/net/gaia/google_service_auth_error.h"
+#include "content/browser/webui/web_ui_util.h"
 
 namespace remoting {