1 files changed, 79 insertions, 2 deletions
diff --git a/chromium/ui/views/views_delegate.cc b/chromium/ui/views/views_delegate.cc
index 20cb88f9359..c1c7ca6bd44 100644
--- a/chromium/ui/views/views_delegate.cc
+++ b/chromium/ui/views/views_delegate.cc
@@ -4,12 +4,12 @@
 
 #include "ui/views/views_delegate.h"
 
-#include "ui/views/touchui/touch_selection_controller_impl.h"
+#include "ui/views/views_touch_selection_controller_factory.h"
 
 namespace views {
 
 ViewsDelegate::ViewsDelegate()
-    : views_tsc_factory_(new views::ViewsTouchSelectionControllerFactory) {
+    : views_tsc_factory_(new ViewsTouchSelectionControllerFactory) {
   ui::TouchSelectionControllerFactory::SetInstance(views_tsc_factory_.get());
 }
 
@@ -17,4 +17,81 @@ ViewsDelegate::~ViewsDelegate() {
   ui::TouchSelectionControllerFactory::SetInstance(NULL);
 }
 
+void ViewsDelegate::SaveWindowPlacement(const Widget* widget,
+                                        const std::string& window_name,
+                                        const gfx::Rect& bounds,
+                                        ui::WindowShowState show_state) {
+}
+
+bool ViewsDelegate::GetSavedWindowPlacement(
+    const Widget* widget,
+    const std::string& window_name,
+    gfx::Rect* bounds,
+    ui::WindowShowState* show_state) const {
+  return false;
+}
+
+void ViewsDelegate::NotifyAccessibilityEvent(View* view,
+                                             ui::AXEvent event_type) {
+}
+
+void ViewsDelegate::NotifyMenuItemFocused(const base::string16& menu_name,
+                                          const base::string16& menu_item_name,
+                                          int item_index,
+                                          int item_count,
+                                          bool has_submenu) {
+}
+
+#if defined(OS_WIN)
+HICON ViewsDelegate::GetDefaultWindowIcon() const {
+  return NULL;
+}
+
+bool ViewsDelegate::IsWindowInMetro(gfx::NativeWindow window) const {
+  return false;
+}
+#elif defined(OS_LINUX) && !defined(OS_CHROMEOS)
+gfx::ImageSkia* ViewsDelegate::GetDefaultWindowIcon() const {
+  return NULL;
+}
+#endif
+
+NonClientFrameView* ViewsDelegate::CreateDefaultNonClientFrameView(
+    Widget* widget) {
+  return NULL;
+}
+
+void ViewsDelegate::AddRef() {
+}
+
+void ViewsDelegate::ReleaseRef() {
+}
+
+content::WebContents* ViewsDelegate::CreateWebContents(
+    content::BrowserContext* browser_context,
+    content::SiteInstance* site_instance) {
+  return NULL;
+}
+
+base::TimeDelta ViewsDelegate::GetDefaultTextfieldObscuredRevealDuration() {
+  return base::TimeDelta();
+}
+
+bool ViewsDelegate::WindowManagerProvidesTitleBar(bool maximized) {
+  return false;
+}
+
+#if defined(USE_AURA)
+ui::ContextFactory* ViewsDelegate::GetContextFactory() {
+  return NULL;
+}
+#endif
+
+#if defined(OS_WIN)
+int ViewsDelegate::GetAppbarAutohideEdges(HMONITOR monitor,
+                                          const base::Closure& callback) {
+  return EDGE_BOTTOM;
+}
+#endif
+
 }  // namespace views