Commit 435fdb33 authored by sky@chromium.org's avatar sky@chromium.org

Adds NOTIMPLEMENTED cursor for android and includes path

Two more tweaks to get compile further along.

BUG=none
TEST=none
R=ben@chromium.org

Review URL: https://codereview.chromium.org/127043005

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@243731 0039d316-1c4b-4281-b951-d872f2087c98
parent cb9c0005
// 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 "ui/base/cursor/cursor.h"
#include "base/logging.h"
namespace ui {
void Cursor::RefCustomCursor() {
NOTIMPLEMENTED();
}
void Cursor::UnrefCustomCursor() {
NOTIMPLEMENTED();
}
} // namespace ui
......@@ -391,7 +391,6 @@
'sources!': [
'animation/throb_animation.cc',
'display_observer.cc',
'path.cc',
'selection_model.cc',
],
'dependencies': [
......@@ -404,6 +403,11 @@
],
},
}],
['OS=="android" and use_aura==0', {
'sources!': [
'path.cc',
],
}],
['OS=="android" and android_webview_build==0', {
'dependencies': [
'<(DEPTH)/base/base.gyp:base_java',
......
......@@ -125,6 +125,7 @@
'base/cocoa/window_size_constants.mm',
'base/cursor/cursor.cc',
'base/cursor/cursor.h',
'base/cursor/cursor_android.cc',
'base/cursor/cursor_loader.h',
'base/cursor/cursor_loader_null.cc',
'base/cursor/cursor_loader_null.h',
......@@ -586,6 +587,11 @@
'android/ui_android.gyp:ui_java',
],
}],
['OS=="android" and use_aura==0', {
'sources!': [
'base/cursor/cursor_android.cc'
],
}],
['OS=="android" or OS=="ios"', {
'sources!': [
'base/device_form_factor_desktop.cc'
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment