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

Side by Side 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 unified diff | Download patch
« no previous file with comments | « ash/test/test_launcher_delegate.cc ('k') | chrome/chrome_tests.gypi » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "ash/test/test_shell_delegate.h" 5 #include "ash/test/test_shell_delegate.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "ash/screenshot_delegate.h" 9 #include "ash/screenshot_delegate.h"
10 #include "ash/shell.h" 10 #include "ash/shell.h"
11 #include "ash/shell_window_ids.h" 11 #include "ash/shell_window_ids.h"
12 #include "ash/test/test_launcher_delegate.h"
12 #include "grit/ui_resources.h" 13 #include "grit/ui_resources.h"
13 #include "ui/aura/window.h" 14 #include "ui/aura/window.h"
14 15
15 namespace ash { 16 namespace ash {
16 namespace test { 17 namespace test {
17 18
18 TestShellDelegate::TestShellDelegate() : locked_(false) { 19 TestShellDelegate::TestShellDelegate() : locked_(false) {
19 } 20 }
20 21
21 TestShellDelegate::~TestShellDelegate() { 22 TestShellDelegate::~TestShellDelegate() {
(...skipping 29 matching lines...) Expand all
51 } 52 }
52 53
53 void TestShellDelegate::StartPartialScreenshot( 54 void TestShellDelegate::StartPartialScreenshot(
54 ScreenshotDelegate* screenshot_delegate) { 55 ScreenshotDelegate* screenshot_delegate) {
55 if (screenshot_delegate) 56 if (screenshot_delegate)
56 screenshot_delegate->HandleTakePartialScreenshot(NULL, gfx::Rect()); 57 screenshot_delegate->HandleTakePartialScreenshot(NULL, gfx::Rect());
57 } 58 }
58 59
59 LauncherDelegate* TestShellDelegate::CreateLauncherDelegate( 60 LauncherDelegate* TestShellDelegate::CreateLauncherDelegate(
60 ash::LauncherModel* model) { 61 ash::LauncherModel* model) {
61 return NULL; 62 return new TestLauncherDelegate(model);
62 } 63 }
63 64
64 SystemTrayDelegate* TestShellDelegate::CreateSystemTrayDelegate( 65 SystemTrayDelegate* TestShellDelegate::CreateSystemTrayDelegate(
65 SystemTray* tray) { 66 SystemTray* tray) {
66 return NULL; 67 return NULL;
67 } 68 }
68 69
69 UserWallpaperDelegate* TestShellDelegate::CreateUserWallpaperDelegate() { 70 UserWallpaperDelegate* TestShellDelegate::CreateUserWallpaperDelegate() {
70 return NULL; 71 return NULL;
71 } 72 }
72 73
73 } // namespace test 74 } // namespace test
74 } // namespace ash 75 } // namespace ash
OLDNEW
« 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