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

Side by Side Diff: chrome/browser/ui/ash/launcher/chrome_launcher_controller_unittest.cc

Issue 527693002: Move AppWindowContentsImpl to extensions (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 6 years, 3 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
« no previous file with comments | « chrome/browser/power/process_power_collector_unittest.cc ('k') | extensions/browser/BUILD.gn » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 29 matching lines...) Expand all
40 #include "chrome/test/base/testing_pref_service_syncable.h" 40 #include "chrome/test/base/testing_pref_service_syncable.h"
41 #include "chrome/test/base/testing_profile.h" 41 #include "chrome/test/base/testing_profile.h"
42 #include "content/public/browser/web_contents.h" 42 #include "content/public/browser/web_contents.h"
43 #include "extensions/common/extension.h" 43 #include "extensions/common/extension.h"
44 #include "extensions/common/manifest_constants.h" 44 #include "extensions/common/manifest_constants.h"
45 #include "testing/gtest/include/gtest/gtest.h" 45 #include "testing/gtest/include/gtest/gtest.h"
46 #include "ui/aura/client/window_tree_client.h" 46 #include "ui/aura/client/window_tree_client.h"
47 #include "ui/base/models/menu_model.h" 47 #include "ui/base/models/menu_model.h"
48 48
49 #if defined(OS_CHROMEOS) 49 #if defined(OS_CHROMEOS)
50 #include "apps/app_window_contents.h"
51 #include "ash/test/test_session_state_delegate.h" 50 #include "ash/test/test_session_state_delegate.h"
52 #include "ash/test/test_shell_delegate.h" 51 #include "ash/test/test_shell_delegate.h"
53 #include "chrome/browser/chromeos/login/users/fake_user_manager.h" 52 #include "chrome/browser/chromeos/login/users/fake_user_manager.h"
54 #include "chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h" 53 #include "chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h"
55 #include "chrome/browser/ui/apps/chrome_app_delegate.h" 54 #include "chrome/browser/ui/apps/chrome_app_delegate.h"
56 #include "chrome/browser/ui/ash/launcher/app_window_launcher_controller.h" 55 #include "chrome/browser/ui/ash/launcher/app_window_launcher_controller.h"
57 #include "chrome/browser/ui/ash/launcher/browser_status_monitor.h" 56 #include "chrome/browser/ui/ash/launcher/browser_status_monitor.h"
58 #include "chrome/browser/ui/ash/multi_user/multi_user_util.h" 57 #include "chrome/browser/ui/ash/multi_user/multi_user_util.h"
59 #include "chrome/browser/ui/ash/multi_user/multi_user_window_manager.h" 58 #include "chrome/browser/ui/ash/multi_user/multi_user_window_manager.h"
60 #include "chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos.h" 59 #include "chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos.h"
61 #include "chrome/common/chrome_constants.h" 60 #include "chrome/common/chrome_constants.h"
62 #include "chrome/common/chrome_switches.h" 61 #include "chrome/common/chrome_switches.h"
63 #include "chrome/test/base/testing_browser_process.h" 62 #include "chrome/test/base/testing_browser_process.h"
64 #include "chrome/test/base/testing_profile_manager.h" 63 #include "chrome/test/base/testing_profile_manager.h"
65 #include "content/public/browser/web_contents_observer.h" 64 #include "content/public/browser/web_contents_observer.h"
66 #include "content/public/test/test_utils.h" 65 #include "content/public/test/test_utils.h"
66 #include "extensions/browser/app_window/app_window_contents.h"
67 #include "extensions/browser/app_window/app_window_registry.h" 67 #include "extensions/browser/app_window/app_window_registry.h"
68 #include "extensions/browser/app_window/native_app_window.h" 68 #include "extensions/browser/app_window/native_app_window.h"
69 #include "ui/aura/window.h" 69 #include "ui/aura/window.h"
70 #endif 70 #endif
71 71
72 using base::ASCIIToUTF16; 72 using base::ASCIIToUTF16;
73 using extensions::Extension; 73 using extensions::Extension;
74 using extensions::Manifest; 74 using extensions::Manifest;
75 using extensions::UnloadedExtensionInfo; 75 using extensions::UnloadedExtensionInfo;
76 76
(...skipping 663 matching lines...) Expand 10 before | Expand all | Expand 10 after
740 // A V2 application which gets created with an |extension| and for a |profile|. 740 // A V2 application which gets created with an |extension| and for a |profile|.
741 // Upon destruction it will properly close the application. 741 // Upon destruction it will properly close the application.
742 class V2App { 742 class V2App {
743 public: 743 public:
744 V2App(Profile* profile, const extensions::Extension* extension) { 744 V2App(Profile* profile, const extensions::Extension* extension) {
745 window_ = new extensions::AppWindow(profile, new ChromeAppDelegate(), 745 window_ = new extensions::AppWindow(profile, new ChromeAppDelegate(),
746 extension); 746 extension);
747 extensions::AppWindow::CreateParams params = 747 extensions::AppWindow::CreateParams params =
748 extensions::AppWindow::CreateParams(); 748 extensions::AppWindow::CreateParams();
749 window_->Init(GURL(std::string()), 749 window_->Init(GURL(std::string()),
750 new apps::AppWindowContentsImpl(window_), params); 750 new extensions::AppWindowContentsImpl(window_), params);
751 } 751 }
752 752
753 virtual ~V2App() { 753 virtual ~V2App() {
754 WebContentsDestroyedWatcher destroyed_watcher(window_->web_contents()); 754 WebContentsDestroyedWatcher destroyed_watcher(window_->web_contents());
755 window_->GetBaseWindow()->Close(); 755 window_->GetBaseWindow()->Close();
756 destroyed_watcher.Wait(); 756 destroyed_watcher.Wait();
757 } 757 }
758 758
759 extensions::AppWindow* window() { return window_; } 759 extensions::AppWindow* window() { return window_; }
760 760
(...skipping 1922 matching lines...) Expand 10 before | Expand all | Expand 10 after
2683 2683
2684 EXPECT_EQ(1, app_icon_loader->fetch_count()); 2684 EXPECT_EQ(1, app_icon_loader->fetch_count());
2685 ASSERT_EQ(initial_size + 1, model_->items().size()); 2685 ASSERT_EQ(initial_size + 1, model_->items().size());
2686 EXPECT_TRUE(launcher_controller_->IsAppPinned("1")); 2686 EXPECT_TRUE(launcher_controller_->IsAppPinned("1"));
2687 EXPECT_FALSE(launcher_controller_->IsAppPinned("0")); 2687 EXPECT_FALSE(launcher_controller_->IsAppPinned("0"));
2688 EXPECT_EQ(ash::TYPE_APP_SHORTCUT, model_->items()[app_index].type); 2688 EXPECT_EQ(ash::TYPE_APP_SHORTCUT, model_->items()[app_index].type);
2689 2689
2690 launcher_controller_->UnpinAppWithID("1"); 2690 launcher_controller_->UnpinAppWithID("1");
2691 ASSERT_EQ(initial_size, model_->items().size()); 2691 ASSERT_EQ(initial_size, model_->items().size());
2692 } 2692 }
OLDNEW
« no previous file with comments | « chrome/browser/power/process_power_collector_unittest.cc ('k') | extensions/browser/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698