| 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_app.h" | 5 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_app.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/utf_string_conversions.h" | 17 #include "base/utf_string_conversions.h" |
| 18 #include "base/values.h" | 18 #include "base/values.h" |
| 19 #include "chrome/browser/extensions/extension_service.h" | 19 #include "chrome/browser/extensions/extension_service.h" |
| 20 #include "chrome/browser/extensions/test_extension_system.h" | 20 #include "chrome/browser/extensions/test_extension_system.h" |
| 21 #include "chrome/browser/ui/ash/chrome_launcher_prefs.h" | 21 #include "chrome/browser/ui/ash/chrome_launcher_prefs.h" |
| 22 #include "chrome/browser/ui/ash/launcher/launcher_item_controller.h" | 22 #include "chrome/browser/ui/ash/launcher/launcher_item_controller.h" |
| 23 #include "chrome/browser/ui/browser_commands.h" | 23 #include "chrome/browser/ui/browser_commands.h" |
| 24 #include "chrome/browser/ui/browser_list.h" | 24 #include "chrome/browser/ui/browser_list.h" |
| 25 #include "chrome/browser/ui/tabs/tab_strip_model.h" | 25 #include "chrome/browser/ui/tabs/tab_strip_model.h" |
| 26 #include "chrome/common/extensions/extension.h" | 26 #include "chrome/common/extensions/extension.h" |
| 27 #include "chrome/common/pref_names.h" | 27 #include "chrome/common/pref_names.h" |
| 28 #include "chrome/test/base/browser_with_test_window_test.h" | 28 #include "chrome/test/base/browser_with_test_window_test.h" |
| 29 #include "chrome/test/base/testing_pref_service.h" | 29 #include "chrome/test/base/testing_pref_service_syncable.h" |
| 30 #include "chrome/test/base/testing_profile.h" | 30 #include "chrome/test/base/testing_profile.h" |
| 31 #include "content/public/test/test_browser_thread.h" | 31 #include "content/public/test/test_browser_thread.h" |
| 32 #include "testing/gtest/include/gtest/gtest.h" | 32 #include "testing/gtest/include/gtest/gtest.h" |
| 33 #include "ui/base/models/menu_model.h" | 33 #include "ui/base/models/menu_model.h" |
| 34 | 34 |
| 35 using extensions::Extension; | 35 using extensions::Extension; |
| 36 using extensions::Manifest; | 36 using extensions::Manifest; |
| 37 | 37 |
| 38 namespace { | 38 namespace { |
| 39 const int kExpectedAppIndex = 1; | 39 const int kExpectedAppIndex = 1; |
| (...skipping 441 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 481 { | 481 { |
| 482 scoped_ptr<ui::MenuModel> menu( | 482 scoped_ptr<ui::MenuModel> menu( |
| 483 launcher_controller.CreateApplicationMenu(item_gmail)); | 483 launcher_controller.CreateApplicationMenu(item_gmail)); |
| 484 int first_item = | 484 int first_item = |
| 485 (menu->GetTypeAt(0) == ui::MenuModel::TYPE_SEPARATOR) ? 1 : 0; | 485 (menu->GetTypeAt(0) == ui::MenuModel::TYPE_SEPARATOR) ? 1 : 0; |
| 486 menu->ActivatedAt(first_item + 3); | 486 menu->ActivatedAt(first_item + 3); |
| 487 } | 487 } |
| 488 // Now the active tab should be the second item. | 488 // Now the active tab should be the second item. |
| 489 EXPECT_EQ(0, browser()->tab_strip_model()->active_index()); | 489 EXPECT_EQ(0, browser()->tab_strip_model()->active_index()); |
| 490 } | 490 } |
| OLD | NEW |