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

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

Issue 10905242: add ash_resources.grd and necessary changes to use images in ash/resources (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: don't guard ash_strings with aura=1 Created 8 years, 3 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/system/web_notification/web_notification_tray.cc ('k') | ash/test/test_shell_delegate.cc » ('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_launcher_delegate.h" 5 #include "ash/test/test_launcher_delegate.h"
6 6
7 #include "ash/launcher/launcher_model.h" 7 #include "ash/launcher/launcher_model.h"
8 #include "ash/wm/window_util.h" 8 #include "ash/wm/window_util.h"
9 #include "base/utf_string_conversions.h" 9 #include "base/utf_string_conversions.h"
10 #include "grit/ui_resources.h" 10 #include "grit/ash_resources.h"
11 #include "ui/aura/window.h" 11 #include "ui/aura/window.h"
12 12
13 namespace ash { 13 namespace ash {
14 namespace test { 14 namespace test {
15 15
16 TestLauncherDelegate* TestLauncherDelegate::instance_ = NULL; 16 TestLauncherDelegate* TestLauncherDelegate::instance_ = NULL;
17 17
18 TestLauncherDelegate::TestLauncherDelegate(LauncherModel* model) 18 TestLauncherDelegate::TestLauncherDelegate(LauncherModel* model)
19 : model_(model) { 19 : model_(model) {
20 CHECK(!instance_); 20 CHECK(!instance_);
(...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after
105 } 105 }
106 return NULL; 106 return NULL;
107 } 107 }
108 108
109 bool TestLauncherDelegate::IsDraggable(const ash::LauncherItem& item) { 109 bool TestLauncherDelegate::IsDraggable(const ash::LauncherItem& item) {
110 return true; 110 return true;
111 } 111 }
112 112
113 } // namespace test 113 } // namespace test
114 } // namespace ash 114 } // namespace ash
OLDNEW
« no previous file with comments | « ash/system/web_notification/web_notification_tray.cc ('k') | ash/test/test_shell_delegate.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698