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

Side by Side Diff: ash/test/test_shell_delegate.cc

Issue 10142005: Revert 133089 - Implement LauncherIconObserver. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: 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 | Annotate | Revision Log
« 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"
13 #include "grit/ui_resources.h" 12 #include "grit/ui_resources.h"
14 #include "ui/aura/window.h" 13 #include "ui/aura/window.h"
15 14
16 namespace ash { 15 namespace ash {
17 namespace test { 16 namespace test {
18 17
19 TestShellDelegate::TestShellDelegate() : locked_(false) { 18 TestShellDelegate::TestShellDelegate() : locked_(false) {
20 } 19 }
21 20
22 TestShellDelegate::~TestShellDelegate() { 21 TestShellDelegate::~TestShellDelegate() {
(...skipping 29 matching lines...) Expand all
52 } 51 }
53 52
54 void TestShellDelegate::StartPartialScreenshot( 53 void TestShellDelegate::StartPartialScreenshot(
55 ScreenshotDelegate* screenshot_delegate) { 54 ScreenshotDelegate* screenshot_delegate) {
56 if (screenshot_delegate) 55 if (screenshot_delegate)
57 screenshot_delegate->HandleTakePartialScreenshot(NULL, gfx::Rect()); 56 screenshot_delegate->HandleTakePartialScreenshot(NULL, gfx::Rect());
58 } 57 }
59 58
60 LauncherDelegate* TestShellDelegate::CreateLauncherDelegate( 59 LauncherDelegate* TestShellDelegate::CreateLauncherDelegate(
61 ash::LauncherModel* model) { 60 ash::LauncherModel* model) {
62 return new TestLauncherDelegate(model); 61 return NULL;
63 } 62 }
64 63
65 SystemTrayDelegate* TestShellDelegate::CreateSystemTrayDelegate( 64 SystemTrayDelegate* TestShellDelegate::CreateSystemTrayDelegate(
66 SystemTray* tray) { 65 SystemTray* tray) {
67 return NULL; 66 return NULL;
68 } 67 }
69 68
70 UserWallpaperDelegate* TestShellDelegate::CreateUserWallpaperDelegate() { 69 UserWallpaperDelegate* TestShellDelegate::CreateUserWallpaperDelegate() {
71 return NULL; 70 return NULL;
72 } 71 }
73 72
74 } // namespace test 73 } // namespace test
75 } // namespace ash 74 } // 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