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

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

Issue 479933003: Move NativeAppWindow to extensions (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 4 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 | Annotate | Revision Log
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 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
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" 50 #include "apps/app_window_contents.h"
51 #include "apps/app_window_registry.h" 51 #include "apps/app_window_registry.h"
52 #include "apps/ui/native_app_window.h"
53 #include "ash/test/test_session_state_delegate.h" 52 #include "ash/test/test_session_state_delegate.h"
54 #include "ash/test/test_shell_delegate.h" 53 #include "ash/test/test_shell_delegate.h"
55 #include "chrome/browser/chromeos/login/users/fake_user_manager.h" 54 #include "chrome/browser/chromeos/login/users/fake_user_manager.h"
56 #include "chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h" 55 #include "chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h"
57 #include "chrome/browser/ui/apps/chrome_app_delegate.h" 56 #include "chrome/browser/ui/apps/chrome_app_delegate.h"
58 #include "chrome/browser/ui/ash/launcher/app_window_launcher_controller.h" 57 #include "chrome/browser/ui/ash/launcher/app_window_launcher_controller.h"
59 #include "chrome/browser/ui/ash/launcher/browser_status_monitor.h" 58 #include "chrome/browser/ui/ash/launcher/browser_status_monitor.h"
60 #include "chrome/browser/ui/ash/multi_user/multi_user_util.h" 59 #include "chrome/browser/ui/ash/multi_user/multi_user_util.h"
61 #include "chrome/browser/ui/ash/multi_user/multi_user_window_manager.h" 60 #include "chrome/browser/ui/ash/multi_user/multi_user_window_manager.h"
62 #include "chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos.h" 61 #include "chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos.h"
63 #include "chrome/common/chrome_constants.h" 62 #include "chrome/common/chrome_constants.h"
64 #include "chrome/common/chrome_switches.h" 63 #include "chrome/common/chrome_switches.h"
65 #include "chrome/test/base/testing_browser_process.h" 64 #include "chrome/test/base/testing_browser_process.h"
66 #include "chrome/test/base/testing_profile_manager.h" 65 #include "chrome/test/base/testing_profile_manager.h"
67 #include "content/public/browser/web_contents_observer.h" 66 #include "content/public/browser/web_contents_observer.h"
68 #include "content/public/test/test_utils.h" 67 #include "content/public/test/test_utils.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
77 namespace { 77 namespace {
78 const char* offline_gmail_url = "https://mail.google.com/mail/mu/u"; 78 const char* offline_gmail_url = "https://mail.google.com/mail/mu/u";
(...skipping 2613 matching lines...) Expand 10 before | Expand all | Expand 10 after
2692 2692
2693 EXPECT_EQ(1, app_icon_loader->fetch_count()); 2693 EXPECT_EQ(1, app_icon_loader->fetch_count());
2694 ASSERT_EQ(initial_size + 1, model_->items().size()); 2694 ASSERT_EQ(initial_size + 1, model_->items().size());
2695 EXPECT_TRUE(launcher_controller_->IsAppPinned("1")); 2695 EXPECT_TRUE(launcher_controller_->IsAppPinned("1"));
2696 EXPECT_FALSE(launcher_controller_->IsAppPinned("0")); 2696 EXPECT_FALSE(launcher_controller_->IsAppPinned("0"));
2697 EXPECT_EQ(ash::TYPE_APP_SHORTCUT, model_->items()[app_index].type); 2697 EXPECT_EQ(ash::TYPE_APP_SHORTCUT, model_->items()[app_index].type);
2698 2698
2699 launcher_controller_->UnpinAppWithID("1"); 2699 launcher_controller_->UnpinAppWithID("1");
2700 ASSERT_EQ(initial_size, model_->items().size()); 2700 ASSERT_EQ(initial_size, model_->items().size());
2701 } 2701 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698