| 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 20 matching lines...) Expand all Loading... |
| 31 #include "content/public/test/web_contents_tester.h" | 31 #include "content/public/test/web_contents_tester.h" |
| 32 #include "extensions/browser/extension_prefs.h" | 32 #include "extensions/browser/extension_prefs.h" |
| 33 #include "extensions/common/manifest_constants.h" | 33 #include "extensions/common/manifest_constants.h" |
| 34 #include "sync/api/string_ordinal.h" | 34 #include "sync/api/string_ordinal.h" |
| 35 | 35 |
| 36 #if defined(OS_LINUX) | 36 #if defined(OS_LINUX) |
| 37 #include "chrome/browser/ui/browser_window.h" | 37 #include "chrome/browser/ui/browser_window.h" |
| 38 #include "ui/base/x/x11_util.h" | 38 #include "ui/base/x/x11_util.h" |
| 39 #endif | 39 #endif |
| 40 | 40 |
| 41 #if defined(OS_LINUX) && !defined(USE_AURA) | |
| 42 #include "ui/base/x/active_window_watcher_x.h" | |
| 43 #endif | |
| 44 | |
| 45 #if defined(OS_MACOSX) | 41 #if defined(OS_MACOSX) |
| 46 #include "base/mac/scoped_nsautorelease_pool.h" | 42 #include "base/mac/scoped_nsautorelease_pool.h" |
| 47 #include "chrome/browser/ui/cocoa/run_loop_testing.h" | 43 #include "chrome/browser/ui/cocoa/run_loop_testing.h" |
| 48 #endif | 44 #endif |
| 49 | 45 |
| 50 using content::WebContentsTester; | 46 using content::WebContentsTester; |
| 51 using extensions::Extension; | 47 using extensions::Extension; |
| 52 | 48 |
| 53 namespace { | 49 namespace { |
| 54 | 50 |
| (...skipping 560 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 615 void BasePanelBrowserTest::MoveMouse(const gfx::Point& position) { | 611 void BasePanelBrowserTest::MoveMouse(const gfx::Point& position) { |
| 616 PanelManager::GetInstance()->mouse_watcher()->NotifyMouseMovement(position); | 612 PanelManager::GetInstance()->mouse_watcher()->NotifyMouseMovement(position); |
| 617 } | 613 } |
| 618 | 614 |
| 619 std::string BasePanelBrowserTest::MakePanelName(int index) { | 615 std::string BasePanelBrowserTest::MakePanelName(int index) { |
| 620 std::string panel_name("Panel"); | 616 std::string panel_name("Panel"); |
| 621 return panel_name + base::IntToString(index); | 617 return panel_name + base::IntToString(index); |
| 622 } | 618 } |
| 623 | 619 |
| 624 bool BasePanelBrowserTest::WmSupportWindowActivation() { | 620 bool BasePanelBrowserTest::WmSupportWindowActivation() { |
| 625 #if defined(OS_LINUX) && !defined(USE_AURA) | |
| 626 return ui::ActiveWindowWatcherX::WMSupportsActivation(); | |
| 627 #else | |
| 628 return true; | 621 return true; |
| 629 #endif | |
| 630 } | 622 } |
| OLD | NEW |