OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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 |
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
45 #include "testing/gtest/include/gtest/gtest.h" | 45 #include "testing/gtest/include/gtest/gtest.h" |
46 #include "ui/base/models/menu_model.h" | 46 #include "ui/base/models/menu_model.h" |
47 | 47 |
48 #if defined(OS_CHROMEOS) | 48 #if defined(OS_CHROMEOS) |
49 #include "apps/app_window_contents.h" | 49 #include "apps/app_window_contents.h" |
50 #include "apps/app_window_registry.h" | 50 #include "apps/app_window_registry.h" |
51 #include "apps/ui/native_app_window.h" | 51 #include "apps/ui/native_app_window.h" |
52 #include "ash/test/test_session_state_delegate.h" | 52 #include "ash/test/test_session_state_delegate.h" |
53 #include "ash/test/test_shell_delegate.h" | 53 #include "ash/test/test_shell_delegate.h" |
54 #include "chrome/browser/chromeos/login/fake_user_manager.h" | 54 #include "chrome/browser/chromeos/login/fake_user_manager.h" |
55 #include "chrome/browser/ui/apps/chrome_shell_window_delegate.h" | 55 #include "chrome/browser/ui/apps/chrome_app_window_delegate.h" |
56 #include "chrome/browser/ui/ash/launcher/app_window_launcher_controller.h" | 56 #include "chrome/browser/ui/ash/launcher/app_window_launcher_controller.h" |
57 #include "chrome/browser/ui/ash/launcher/browser_status_monitor.h" | 57 #include "chrome/browser/ui/ash/launcher/browser_status_monitor.h" |
58 #include "chrome/browser/ui/ash/multi_user/multi_user_util.h" | 58 #include "chrome/browser/ui/ash/multi_user/multi_user_util.h" |
59 #include "chrome/browser/ui/ash/multi_user/multi_user_window_manager.h" | 59 #include "chrome/browser/ui/ash/multi_user/multi_user_window_manager.h" |
60 #include "chrome/common/chrome_constants.h" | 60 #include "chrome/common/chrome_constants.h" |
61 #include "chrome/common/chrome_switches.h" | 61 #include "chrome/common/chrome_switches.h" |
62 #include "chrome/test/base/testing_browser_process.h" | 62 #include "chrome/test/base/testing_browser_process.h" |
63 #include "chrome/test/base/testing_profile_manager.h" | 63 #include "chrome/test/base/testing_profile_manager.h" |
64 #include "content/public/browser/web_contents_observer.h" | 64 #include "content/public/browser/web_contents_observer.h" |
65 #include "content/public/test/test_utils.h" | 65 #include "content/public/test/test_utils.h" |
(...skipping 709 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
775 scoped_ptr<aura::Window> native_window_; | 775 scoped_ptr<aura::Window> native_window_; |
776 | 776 |
777 DISALLOW_COPY_AND_ASSIGN(V1App); | 777 DISALLOW_COPY_AND_ASSIGN(V1App); |
778 }; | 778 }; |
779 | 779 |
780 // A V2 application which gets created with an |extension| and for a |profile|. | 780 // A V2 application which gets created with an |extension| and for a |profile|. |
781 // Upon destruction it will properly close the application. | 781 // Upon destruction it will properly close the application. |
782 class V2App { | 782 class V2App { |
783 public: | 783 public: |
784 V2App(Profile* profile, const extensions::Extension* extension) { | 784 V2App(Profile* profile, const extensions::Extension* extension) { |
785 window_ = new apps::AppWindow( | 785 window_ = |
786 profile, new ChromeShellWindowDelegate(), extension); | 786 new apps::AppWindow(profile, new ChromeAppWindowDelegate(), extension); |
787 apps::AppWindow::CreateParams params = apps::AppWindow::CreateParams(); | 787 apps::AppWindow::CreateParams params = apps::AppWindow::CreateParams(); |
788 window_->Init( | 788 window_->Init( |
789 GURL(std::string()), new apps::AppWindowContentsImpl(window_), params); | 789 GURL(std::string()), new apps::AppWindowContentsImpl(window_), params); |
790 } | 790 } |
791 | 791 |
792 virtual ~V2App() { | 792 virtual ~V2App() { |
793 WebContentsDestroyedWatcher destroyed_watcher(window_->web_contents()); | 793 WebContentsDestroyedWatcher destroyed_watcher(window_->web_contents()); |
794 window_->GetBaseWindow()->Close(); | 794 window_->GetBaseWindow()->Close(); |
795 destroyed_watcher.Wait(); | 795 destroyed_watcher.Wait(); |
796 } | 796 } |
(...skipping 1990 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2787 | 2787 |
2788 EXPECT_EQ(1, app_icon_loader->fetch_count()); | 2788 EXPECT_EQ(1, app_icon_loader->fetch_count()); |
2789 ASSERT_EQ(initial_size + 1, model_->items().size()); | 2789 ASSERT_EQ(initial_size + 1, model_->items().size()); |
2790 EXPECT_TRUE(launcher_controller_->IsAppPinned("1")); | 2790 EXPECT_TRUE(launcher_controller_->IsAppPinned("1")); |
2791 EXPECT_FALSE(launcher_controller_->IsAppPinned("0")); | 2791 EXPECT_FALSE(launcher_controller_->IsAppPinned("0")); |
2792 EXPECT_EQ(ash::TYPE_APP_SHORTCUT, model_->items()[app_index].type); | 2792 EXPECT_EQ(ash::TYPE_APP_SHORTCUT, model_->items()[app_index].type); |
2793 | 2793 |
2794 launcher_controller_->UnpinAppWithID("1"); | 2794 launcher_controller_->UnpinAppWithID("1"); |
2795 ASSERT_EQ(initial_size, model_->items().size()); | 2795 ASSERT_EQ(initial_size, model_->items().size()); |
2796 } | 2796 } |
OLD | NEW |