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

Unified Diff: ash/test/test_shell_delegate.cc

Issue 10116011: Add LauncherIconObserver. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Fix CrOS build Created 8 years, 8 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/test/test_launcher_delegate.cc ('k') | chrome/chrome_tests.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/test/test_shell_delegate.cc
diff --git a/ash/test/test_shell_delegate.cc b/ash/test/test_shell_delegate.cc
index dfb111201ece2b30e411ee59355a99b54c9be99a..d24d34b1c46d9abdfca53e18a060ee9aede8302a 100644
--- a/ash/test/test_shell_delegate.cc
+++ b/ash/test/test_shell_delegate.cc
@@ -9,6 +9,7 @@
#include "ash/screenshot_delegate.h"
#include "ash/shell.h"
#include "ash/shell_window_ids.h"
+#include "ash/test/test_launcher_delegate.h"
#include "grit/ui_resources.h"
#include "ui/aura/window.h"
@@ -58,7 +59,7 @@ void TestShellDelegate::StartPartialScreenshot(
LauncherDelegate* TestShellDelegate::CreateLauncherDelegate(
ash::LauncherModel* model) {
- return NULL;
+ return new TestLauncherDelegate(model);
}
SystemTrayDelegate* TestShellDelegate::CreateSystemTrayDelegate(
« no previous file with comments | « ash/test/test_launcher_delegate.cc ('k') | chrome/chrome_tests.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698