OLD | NEW |
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 "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h" | 5 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 #include <string> | 8 #include <string> |
9 #include <vector> | 9 #include <vector> |
10 | 10 |
11 #include "ash/launcher/launcher_model.h" | 11 #include "ash/launcher/launcher_model.h" |
| 12 #include "base/command_line.h" |
12 #include "base/compiler_specific.h" | 13 #include "base/compiler_specific.h" |
13 #include "base/file_path.h" | 14 #include "base/file_path.h" |
14 #include "base/memory/scoped_ptr.h" | 15 #include "base/memory/scoped_ptr.h" |
15 #include "base/message_loop.h" | 16 #include "base/message_loop.h" |
16 #include "base/values.h" | 17 #include "base/values.h" |
17 #include "chrome/browser/extensions/extension_service.h" | 18 #include "chrome/browser/extensions/extension_service.h" |
18 #include "chrome/browser/extensions/test_extension_system.h" | 19 #include "chrome/browser/extensions/test_extension_system.h" |
19 #include "chrome/browser/ui/ash/chrome_launcher_prefs.h" | 20 #include "chrome/browser/ui/ash/chrome_launcher_prefs.h" |
20 #include "chrome/common/extensions/extension.h" | 21 #include "chrome/common/extensions/extension.h" |
21 #include "chrome/common/pref_names.h" | 22 #include "chrome/common/pref_names.h" |
(...skipping 262 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
284 | 285 |
285 GetAppLaunchers(&controller, &actual_launchers); | 286 GetAppLaunchers(&controller, &actual_launchers); |
286 EXPECT_EQ(expected_launchers, actual_launchers); | 287 EXPECT_EQ(expected_launchers, actual_launchers); |
287 | 288 |
288 // Install |extension2| and verify it shows up between the other two. | 289 // Install |extension2| and verify it shows up between the other two. |
289 extension_service_->AddExtension(extension2_.get()); | 290 extension_service_->AddExtension(extension2_.get()); |
290 expected_launchers.insert(expected_launchers.begin() + 1, extension2_->id()); | 291 expected_launchers.insert(expected_launchers.begin() + 1, extension2_->id()); |
291 GetAppLaunchers(&controller, &actual_launchers); | 292 GetAppLaunchers(&controller, &actual_launchers); |
292 EXPECT_EQ(expected_launchers, actual_launchers); | 293 EXPECT_EQ(expected_launchers, actual_launchers); |
293 } | 294 } |
OLD | NEW |