summaryrefslogtreecommitdiffstats
path: root/ash
diff options
context:
space:
mode:
authormlamouri <mlamouri@chromium.org>2016-01-16 08:09:23 -0800
committerCommit bot <commit-bot@chromium.org>2016-01-16 16:10:11 +0000
commit2fbb0e08fb9e45b3aebcfa88a3ad2686af0c6735 (patch)
tree6534ddf8a30a48b18ff21e675f53b1cd15769066 /ash
parent2cd784214a13ceb403cb9ac8c2f5924f363d46ec (diff)
downloadchromium_src-2fbb0e08fb9e45b3aebcfa88a3ad2686af0c6735.zip
chromium_src-2fbb0e08fb9e45b3aebcfa88a3ad2686af0c6735.tar.gz
chromium_src-2fbb0e08fb9e45b3aebcfa88a3ad2686af0c6735.tar.bz2
Make all targets build without unused data members on Linux.
In other words, that means that with this CL and the following: https://codereview.chromium.org/1575763002 https://codereview.chromium.org/1573843002 https://codereview.chromium.org/1578653002 It is now possible to build all targets on top of this CL: https://codereview.chromium.org/1222403002 BUG=447445 R=jam@chromium.org Review URL: https://codereview.chromium.org/1572183002 Cr-Commit-Position: refs/heads/master@{#369955}
Diffstat (limited to 'ash')
-rw-r--r--ash/shelf/shelf_view_unittest.cc7
1 files changed, 2 insertions, 5 deletions
diff --git a/ash/shelf/shelf_view_unittest.cc b/ash/shelf/shelf_view_unittest.cc
index efd75ad..80091d3 100644
--- a/ash/shelf/shelf_view_unittest.cc
+++ b/ash/shelf/shelf_view_unittest.cc
@@ -243,8 +243,7 @@ TEST_F(ShelfViewIconObserverTest, BoundsChanged) {
// value of IsAppPinned(...) is configurable.
class TestShelfDelegateForShelfView : public ShelfDelegate {
public:
- explicit TestShelfDelegateForShelfView(ShelfModel* model)
- : model_(model) {}
+ TestShelfDelegateForShelfView() {}
~TestShelfDelegateForShelfView() override {}
void set_is_app_pinned(bool is_pinned) { is_app_pinned_ = is_pinned; }
@@ -278,8 +277,6 @@ class TestShelfDelegateForShelfView : public ShelfDelegate {
void UnpinAppWithID(const std::string& app_id) override { NOTREACHED(); }
private:
- ShelfModel* model_;
-
// Tracks whether apps are pinned or not.
bool is_app_pinned_ = false;
@@ -681,7 +678,7 @@ class ShelfViewTest : public AshTestBase {
// Replace ShelfDelegate.
test::ShellTestApi shell_test_api(Shell::GetInstance());
shell_test_api.SetShelfDelegate(NULL);
- shelf_delegate_ = new TestShelfDelegateForShelfView(model_);
+ shelf_delegate_ = new TestShelfDelegateForShelfView();
shell_test_api.SetShelfDelegate(shelf_delegate_);
test::ShelfTestAPI(Shelf::ForPrimaryDisplay())
.SetShelfDelegate(shelf_delegate_);