summaryrefslogtreecommitdiffstats
path: root/app
diff options
context:
space:
mode:
authorerg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-13 20:10:45 +0000
committererg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-13 20:10:45 +0000
commitddb1e5ae096bd91da721887fd55e68c603bf7067 (patch)
tree401d9a379ff03bb8b69a1ce9c23fe182f673f587 /app
parent1c9526e0650a91e412d815417634c9f193b1a4d5 (diff)
downloadchromium_src-ddb1e5ae096bd91da721887fd55e68c603bf7067.zip
chromium_src-ddb1e5ae096bd91da721887fd55e68c603bf7067.tar.gz
chromium_src-ddb1e5ae096bd91da721887fd55e68c603bf7067.tar.bz2
Even more virtual method deinlining.
BUG=none TEST=compiles Review URL: http://codereview.chromium.org/5741001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@69041 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'app')
-rw-r--r--app/app_base.gypi1
-rw-r--r--app/multi_animation.cc4
-rw-r--r--app/multi_animation.h2
-rw-r--r--app/tree_model.cc16
-rw-r--r--app/tree_model.h8
5 files changed, 24 insertions, 7 deletions
diff --git a/app/app_base.gypi b/app/app_base.gypi
index e14623c..dad6f9e 100644
--- a/app/app_base.gypi
+++ b/app/app_base.gypi
@@ -26,6 +26,7 @@
'system_monitor_mac.mm',
'system_monitor_posix.cc',
'system_monitor_win.cc',
+ 'tree_model.cc',
'tree_model.h',
'tree_node_iterator.h',
'tree_node_model.h',
diff --git a/app/multi_animation.cc b/app/multi_animation.cc
index 6001a2a..f43470e 100644
--- a/app/multi_animation.cc
+++ b/app/multi_animation.cc
@@ -31,6 +31,10 @@ MultiAnimation::MultiAnimation(const Parts& parts)
MultiAnimation::~MultiAnimation() {}
+double MultiAnimation::GetCurrentValue() const {
+ return current_value_;
+}
+
void MultiAnimation::Step(base::TimeTicks time_now) {
double last_value = current_value_;
size_t last_index = current_part_index_;
diff --git a/app/multi_animation.h b/app/multi_animation.h
index 0f4b38c..f565000 100644
--- a/app/multi_animation.h
+++ b/app/multi_animation.h
@@ -53,7 +53,7 @@ class MultiAnimation : public Animation {
// Returns the current value. The current value for a MultiAnimation is
// determined from the tween type of the current part.
- virtual double GetCurrentValue() const { return current_value_; }
+ virtual double GetCurrentValue() const;
// Returns the index of the current part.
size_t current_part_index() const { return current_part_index_; }
diff --git a/app/tree_model.cc b/app/tree_model.cc
new file mode 100644
index 0000000..39d2d44
--- /dev/null
+++ b/app/tree_model.cc
@@ -0,0 +1,16 @@
+// Copyright (c) 2010 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 "app/tree_model.h"
+
+#include "base/logging.h"
+
+void TreeModel::SetTitle(TreeModelNode* node,
+ const string16& title) {
+ NOTREACHED();
+}
+
+int TreeModel::GetIconIndex(TreeModelNode* node) {
+ return -1;
+}
diff --git a/app/tree_model.h b/app/tree_model.h
index df06b9f..a4ac06f 100644
--- a/app/tree_model.h
+++ b/app/tree_model.h
@@ -8,7 +8,6 @@
#include <vector>
-#include "base/logging.h"
#include "base/string16.h"
class SkBitmap;
@@ -78,10 +77,7 @@ class TreeModel {
// Sets the title of the specified node.
// This is only invoked if the node is editable and the user edits a node.
- virtual void SetTitle(TreeModelNode* node,
- const string16& title) {
- NOTREACHED();
- }
+ virtual void SetTitle(TreeModelNode* node, const string16& title);
// Returns the set of icons for the nodes in the tree. You only need override
// this if you don't want to use the default folder icons.
@@ -90,7 +86,7 @@ class TreeModel {
// Returns the index of the icon to use for |node|. Return -1 to use the
// default icon. The index is relative to the list of icons returned from
// GetIcons.
- virtual int GetIconIndex(TreeModelNode* node) { return -1; }
+ virtual int GetIconIndex(TreeModelNode* node);
protected:
virtual ~TreeModel() {}