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

Side by Side Diff: chrome/browser/ui/extensions/extension_message_bubble_bridge_unittest.cc

Issue 2685333005: ash: fix regression where ctrl+n put new window on wrong desktop (Closed)
Patch Set: Rebase to ToT Created 3 years, 10 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
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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 "base/command_line.h" 5 #include "base/command_line.h"
6 #include "base/logging.h" 6 #include "base/logging.h"
7 #include "base/memory/ptr_util.h" 7 #include "base/memory/ptr_util.h"
8 #include "base/path_service.h" 8 #include "base/path_service.h"
9 #include "base/values.h" 9 #include "base/values.h"
10 #include "chrome/browser/extensions/extension_service.h" 10 #include "chrome/browser/extensions/extension_service.h"
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
58 ExtensionMessageBubbleBridgeUnitTest() {} 58 ExtensionMessageBubbleBridgeUnitTest() {}
59 ~ExtensionMessageBubbleBridgeUnitTest() override {} 59 ~ExtensionMessageBubbleBridgeUnitTest() override {}
60 Browser* browser() { return browser_.get(); } 60 Browser* browser() { return browser_.get(); }
61 61
62 private: 62 private:
63 void SetUp() override { 63 void SetUp() override {
64 ExtensionServiceTestWithInstall::SetUp(); 64 ExtensionServiceTestWithInstall::SetUp();
65 InitializeEmptyExtensionService(); 65 InitializeEmptyExtensionService();
66 66
67 browser_window_.reset(new TestBrowserWindow()); 67 browser_window_.reset(new TestBrowserWindow());
68 Browser::CreateParams params(profile()); 68 Browser::CreateParams params(profile(), true);
69 params.type = Browser::TYPE_TABBED; 69 params.type = Browser::TYPE_TABBED;
70 params.window = browser_window_.get(); 70 params.window = browser_window_.get();
71 browser_.reset(new Browser(params)); 71 browser_.reset(new Browser(params));
72 72
73 extensions::ExtensionWebUIOverrideRegistrar::GetFactoryInstance() 73 extensions::ExtensionWebUIOverrideRegistrar::GetFactoryInstance()
74 ->SetTestingFactory(browser()->profile(), &BuildOverrideRegistrar); 74 ->SetTestingFactory(browser()->profile(), &BuildOverrideRegistrar);
75 extensions::ExtensionWebUIOverrideRegistrar::GetFactoryInstance()->Get( 75 extensions::ExtensionWebUIOverrideRegistrar::GetFactoryInstance()->Get(
76 browser()->profile()); 76 browser()->profile());
77 ToolbarActionsModelFactory::GetInstance()->SetTestingFactory( 77 ToolbarActionsModelFactory::GetInstance()->SetTestingFactory(
78 browser()->profile(), &BuildToolbarModel); 78 browser()->profile(), &BuildToolbarModel);
(...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after
191 191
192 std::unique_ptr<ToolbarActionsBarBubbleDelegate::ExtraViewInfo> 192 std::unique_ptr<ToolbarActionsBarBubbleDelegate::ExtraViewInfo>
193 extra_view_info = bridge->GetExtraViewInfo(); 193 extra_view_info = bridge->GetExtraViewInfo();
194 194
195 ASSERT_TRUE(extra_view_info); 195 ASSERT_TRUE(extra_view_info);
196 EXPECT_FALSE(extra_view_info->text.empty()); 196 EXPECT_FALSE(extra_view_info->text.empty());
197 EXPECT_TRUE(extra_view_info->is_text_linked); 197 EXPECT_TRUE(extra_view_info->is_text_linked);
198 EXPECT_EQ(gfx::VectorIconId::VECTOR_ICON_NONE, 198 EXPECT_EQ(gfx::VectorIconId::VECTOR_ICON_NONE,
199 extra_view_info->resource_id); 199 extra_view_info->resource_id);
200 } 200 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698