| 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_per_browser.
h" | 5 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_browser.
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/command_line.h" |
| 13 #include "base/compiler_specific.h" | 13 #include "base/compiler_specific.h" |
| 14 #include "base/file_path.h" | 14 #include "base/file_path.h" |
| 15 #include "base/memory/scoped_ptr.h" | 15 #include "base/memory/scoped_ptr.h" |
| 16 #include "base/message_loop.h" | 16 #include "base/message_loop.h" |
| 17 #include "base/values.h" | 17 #include "base/values.h" |
| 18 #include "chrome/browser/extensions/extension_service.h" | 18 #include "chrome/browser/extensions/extension_service.h" |
| 19 #include "chrome/browser/extensions/test_extension_system.h" | 19 #include "chrome/browser/extensions/test_extension_system.h" |
| 20 #include "chrome/browser/ui/ash/chrome_launcher_prefs.h" | 20 #include "chrome/browser/ui/ash/chrome_launcher_prefs.h" |
| 21 #include "chrome/browser/ui/ash/launcher/launcher_item_controller.h" | 21 #include "chrome/browser/ui/ash/launcher/launcher_item_controller.h" |
| 22 #include "chrome/common/extensions/extension.h" | 22 #include "chrome/common/extensions/extension.h" |
| 23 #include "chrome/common/pref_names.h" | 23 #include "chrome/common/pref_names.h" |
| 24 #include "chrome/test/base/testing_pref_service.h" | 24 #include "chrome/test/base/testing_pref_service_syncable.h" |
| 25 #include "chrome/test/base/testing_profile.h" | 25 #include "chrome/test/base/testing_profile.h" |
| 26 #include "content/public/test/test_browser_thread.h" | 26 #include "content/public/test/test_browser_thread.h" |
| 27 #include "testing/gtest/include/gtest/gtest.h" | 27 #include "testing/gtest/include/gtest/gtest.h" |
| 28 | 28 |
| 29 using extensions::Extension; | 29 using extensions::Extension; |
| 30 using extensions::Manifest; | 30 using extensions::Manifest; |
| 31 | 31 |
| 32 namespace { | 32 namespace { |
| 33 const int kExpectedAppIndex = 1; | 33 const int kExpectedAppIndex = 1; |
| 34 } | 34 } |
| (...skipping 237 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 272 | 272 |
| 273 GetAppLaunchers(&controller, &actual_launchers); | 273 GetAppLaunchers(&controller, &actual_launchers); |
| 274 EXPECT_EQ(expected_launchers, actual_launchers); | 274 EXPECT_EQ(expected_launchers, actual_launchers); |
| 275 | 275 |
| 276 // Install |extension2| and verify it shows up between the other two. | 276 // Install |extension2| and verify it shows up between the other two. |
| 277 extension_service_->AddExtension(extension2_.get()); | 277 extension_service_->AddExtension(extension2_.get()); |
| 278 expected_launchers.insert(expected_launchers.begin() + 1, extension2_->id()); | 278 expected_launchers.insert(expected_launchers.begin() + 1, extension2_->id()); |
| 279 GetAppLaunchers(&controller, &actual_launchers); | 279 GetAppLaunchers(&controller, &actual_launchers); |
| 280 EXPECT_EQ(expected_launchers, actual_launchers); | 280 EXPECT_EQ(expected_launchers, actual_launchers); |
| 281 } | 281 } |
| OLD | NEW |