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

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

Issue 15735027: Use a direct include of utf_string_conversions.h in android_webview/, apps/, ash/, base/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 6 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 (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/launcher/launcher_util.h" 8 #include "ash/launcher/launcher_util.h"
9 #include "ash/wm/window_util.h" 9 #include "ash/wm/window_util.h"
10 #include "base/utf_string_conversions.h" 10 #include "base/strings/utf_string_conversions.h"
11 #include "grit/ash_resources.h" 11 #include "grit/ash_resources.h"
12 #include "ui/aura/window.h" 12 #include "ui/aura/window.h"
13 13
14 namespace ash { 14 namespace ash {
15 namespace test { 15 namespace test {
16 16
17 TestLauncherDelegate* TestLauncherDelegate::instance_ = NULL; 17 TestLauncherDelegate* TestLauncherDelegate::instance_ = NULL;
18 18
19 TestLauncherDelegate::TestLauncherDelegate(LauncherModel* model) 19 TestLauncherDelegate::TestLauncherDelegate(LauncherModel* model)
20 : model_(model) { 20 : model_(model) {
(...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after
130 } 130 }
131 131
132 void TestLauncherDelegate::PinAppWithID(const std::string& app_id) { 132 void TestLauncherDelegate::PinAppWithID(const std::string& app_id) {
133 } 133 }
134 134
135 void TestLauncherDelegate::UnpinAppsWithID(const std::string& app_id) { 135 void TestLauncherDelegate::UnpinAppsWithID(const std::string& app_id) {
136 } 136 }
137 137
138 } // namespace test 138 } // namespace test
139 } // namespace ash 139 } // namespace ash
OLDNEW
« no previous file with comments | « ash/system/web_notification/web_notification_tray_unittest.cc ('k') | ash/test/test_session_state_delegate.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698