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/panels/base_panel_browser_test.h" | 5 #include "chrome/browser/ui/panels/base_panel_browser_test.h" |
6 | 6 |
7 #include "base/bind.h" | 7 #include "base/bind.h" |
8 #include "base/command_line.h" | 8 #include "base/command_line.h" |
9 #include "base/memory/weak_ptr.h" | 9 #include "base/memory/weak_ptr.h" |
10 #include "base/message_loop/message_loop.h" | 10 #include "base/message_loop/message_loop.h" |
(...skipping 555 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
566 std::string error; | 566 std::string error; |
567 scoped_refptr<Extension> extension = Extension::Create( | 567 scoped_refptr<Extension> extension = Extension::Create( |
568 full_path, location, *input_value, Extension::NO_FLAGS, &error); | 568 full_path, location, *input_value, Extension::NO_FLAGS, &error); |
569 EXPECT_TRUE(extension.get()); | 569 EXPECT_TRUE(extension.get()); |
570 EXPECT_STREQ("", error.c_str()); | 570 EXPECT_STREQ("", error.c_str()); |
571 browser()->profile()->GetExtensionService()-> | 571 browser()->profile()->GetExtensionService()-> |
572 OnExtensionInstalled(extension.get(), | 572 OnExtensionInstalled(extension.get(), |
573 syncer::StringOrdinal(), | 573 syncer::StringOrdinal(), |
574 false /* no requirement errors */, | 574 false /* no requirement errors */, |
575 extensions::NOT_BLACKLISTED, | 575 extensions::NOT_BLACKLISTED, |
| 576 false /* not ephemeral */, |
576 false /* don't wait for idle */); | 577 false /* don't wait for idle */); |
577 return extension; | 578 return extension; |
578 } | 579 } |
579 | 580 |
580 void BasePanelBrowserTest::CloseWindowAndWait(Panel* panel) { | 581 void BasePanelBrowserTest::CloseWindowAndWait(Panel* panel) { |
581 // Closing a panel may involve several async tasks. Need to use | 582 // Closing a panel may involve several async tasks. Need to use |
582 // message pump and wait for the notification. | 583 // message pump and wait for the notification. |
583 PanelManager* manager = PanelManager::GetInstance(); | 584 PanelManager* manager = PanelManager::GetInstance(); |
584 int panel_count = manager->num_panels(); | 585 int panel_count = manager->num_panels(); |
585 content::WindowedNotificationObserver signal( | 586 content::WindowedNotificationObserver signal( |
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
621 return panel_name + base::IntToString(index); | 622 return panel_name + base::IntToString(index); |
622 } | 623 } |
623 | 624 |
624 bool BasePanelBrowserTest::WmSupportWindowActivation() { | 625 bool BasePanelBrowserTest::WmSupportWindowActivation() { |
625 #if defined(OS_LINUX) && !defined(USE_AURA) | 626 #if defined(OS_LINUX) && !defined(USE_AURA) |
626 return ui::ActiveWindowWatcherX::WMSupportsActivation(); | 627 return ui::ActiveWindowWatcherX::WMSupportsActivation(); |
627 #else | 628 #else |
628 return true; | 629 return true; |
629 #endif | 630 #endif |
630 } | 631 } |
OLD | NEW |