Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(14)

Side by Side Diff: chrome/browser/ui/ash/launcher/chrome_launcher_controller_unittest.cc

Issue 37733003: Make GetRootWindow() return a Window instead of a RootWindow. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: First cut for review/trybots Created 7 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h" 5 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 198 matching lines...) Expand 10 before | Expand all | Expand 10 after
209 virtual void ItemSelected(const ui::Event& event) OVERRIDE {} 209 virtual void ItemSelected(const ui::Event& event) OVERRIDE {}
210 virtual string16 GetTitle() OVERRIDE { return string16(); } 210 virtual string16 GetTitle() OVERRIDE { return string16(); }
211 virtual ChromeLauncherAppMenuItems GetApplicationList( 211 virtual ChromeLauncherAppMenuItems GetApplicationList(
212 int event_flags) OVERRIDE { 212 int event_flags) OVERRIDE {
213 ChromeLauncherAppMenuItems items; 213 ChromeLauncherAppMenuItems items;
214 items.push_back(new ChromeLauncherAppMenuItem(string16(), NULL, false)); 214 items.push_back(new ChromeLauncherAppMenuItem(string16(), NULL, false));
215 items.push_back(new ChromeLauncherAppMenuItem(string16(), NULL, false)); 215 items.push_back(new ChromeLauncherAppMenuItem(string16(), NULL, false));
216 return items.Pass(); 216 return items.Pass();
217 } 217 }
218 virtual ui::MenuModel* CreateContextMenu( 218 virtual ui::MenuModel* CreateContextMenu(
219 aura::RootWindow* root_window) OVERRIDE { return NULL; } 219 aura::Window* root_window) OVERRIDE { return NULL; }
220 virtual ash::LauncherMenuModel* CreateApplicationMenu( 220 virtual ash::LauncherMenuModel* CreateApplicationMenu(
221 int event_flags) OVERRIDE { return NULL; } 221 int event_flags) OVERRIDE { return NULL; }
222 virtual bool IsDraggable() OVERRIDE { return false; } 222 virtual bool IsDraggable() OVERRIDE { return false; }
223 virtual bool ShouldShowTooltip() OVERRIDE { return false; } 223 virtual bool ShouldShowTooltip() OVERRIDE { return false; }
224 224
225 private: 225 private:
226 226
227 DISALLOW_COPY_AND_ASSIGN(TestV2AppLauncherItemController); 227 DISALLOW_COPY_AND_ASSIGN(TestV2AppLauncherItemController);
228 }; 228 };
229 229
(...skipping 1764 matching lines...) Expand 10 before | Expand all | Expand 10 after
1994 1994
1995 EXPECT_EQ(1, app_icon_loader->fetch_count()); 1995 EXPECT_EQ(1, app_icon_loader->fetch_count());
1996 ASSERT_EQ(initial_size + 1, model_->items().size()); 1996 ASSERT_EQ(initial_size + 1, model_->items().size());
1997 EXPECT_TRUE(launcher_controller_->IsAppPinned("1")); 1997 EXPECT_TRUE(launcher_controller_->IsAppPinned("1"));
1998 EXPECT_FALSE(launcher_controller_->IsAppPinned("0")); 1998 EXPECT_FALSE(launcher_controller_->IsAppPinned("0"));
1999 EXPECT_EQ(ash::TYPE_APP_SHORTCUT, model_->items()[app_index].type); 1999 EXPECT_EQ(ash::TYPE_APP_SHORTCUT, model_->items()[app_index].type);
2000 2000
2001 launcher_controller_->UnpinAppWithID("1"); 2001 launcher_controller_->UnpinAppWithID("1");
2002 ASSERT_EQ(initial_size, model_->items().size()); 2002 ASSERT_EQ(initial_size, model_->items().size());
2003 } 2003 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698