chrome/browser/ui/panels/base_panel_browser_test.cc - Issue 46853004: Move ExtensionPrefs and friends to extensions/ directory.

Side by Side Diff: chrome/browser/ui/panels/base_panel_browser_test.cc

Issue 46853004: Move ExtensionPrefs and friends to extensions/ directory. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: update Created 6 years, 11 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

« no previous file with comments | « chrome/browser/ui/extensions/application_launch.cc ('k') | chrome/browser/ui/views/extensions/extension_message_bubble_view.cc » ('j') | extensions/browser/DEPS » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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"

11 #include "base/path_service.h"	11 #include "base/path_service.h"

12 #include "base/strings/string_number_conversions.h"	12 #include "base/strings/string_number_conversions.h"

13 #include "chrome/browser/chrome_notification_types.h"	13 #include "chrome/browser/chrome_notification_types.h"

14 #include "chrome/browser/extensions/extension_prefs.h"

15 #include "chrome/browser/extensions/extension_service.h"	14 #include "chrome/browser/extensions/extension_service.h"

16 #include "chrome/browser/profiles/profile.h"	15 #include "chrome/browser/profiles/profile.h"

17 #include "chrome/browser/ui/browser.h"	16 #include "chrome/browser/ui/browser.h"

18 #include "chrome/browser/ui/browser_window.h"	17 #include "chrome/browser/ui/browser_window.h"

19 #include "chrome/browser/ui/panels/detached_panel_collection.h"	18 #include "chrome/browser/ui/panels/detached_panel_collection.h"

20 #include "chrome/browser/ui/panels/native_panel.h"	19 #include "chrome/browser/ui/panels/native_panel.h"

21 #include "chrome/browser/ui/panels/panel_collection.h"	20 #include "chrome/browser/ui/panels/panel_collection.h"

22 #include "chrome/browser/ui/panels/panel_mouse_watcher.h"	21 #include "chrome/browser/ui/panels/panel_mouse_watcher.h"

23 #include "chrome/browser/ui/panels/stacked_panel_collection.h"	22 #include "chrome/browser/ui/panels/stacked_panel_collection.h"

24 #include "chrome/browser/ui/panels/test_panel_active_state_observer.h"	23 #include "chrome/browser/ui/panels/test_panel_active_state_observer.h"

25 #include "chrome/browser/ui/panels/test_panel_mouse_watcher.h"	24 #include "chrome/browser/ui/panels/test_panel_mouse_watcher.h"

26 #include "chrome/common/chrome_paths.h"	25 #include "chrome/common/chrome_paths.h"

27 #include "chrome/common/chrome_switches.h"	26 #include "chrome/common/chrome_switches.h"

28 #include "chrome/test/base/interactive_test_utils.h"	27 #include "chrome/test/base/interactive_test_utils.h"

29 #include "chrome/test/base/ui_test_utils.h"	28 #include "chrome/test/base/ui_test_utils.h"

30 #include "content/public/browser/notification_service.h"	29 #include "content/public/browser/notification_service.h"

31 #include "content/public/common/url_constants.h"	30 #include "content/public/common/url_constants.h"

32 #include "content/public/test/web_contents_tester.h"	31 #include "content/public/test/web_contents_tester.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)	41 #if defined(OS_LINUX) && !defined(USE_AURA)

42 #include "ui/base/x/active_window_watcher_x.h"	42 #include "ui/base/x/active_window_watcher_x.h"

(...skipping 578 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
621 return panel_name + base::IntToString(index);	621 return panel_name + base::IntToString(index);

622 }	622 }

623	623

624 bool BasePanelBrowserTest::WmSupportWindowActivation() {	624 bool BasePanelBrowserTest::WmSupportWindowActivation() {

625 #if defined(OS_LINUX) && !defined(USE_AURA)	625 #if defined(OS_LINUX) && !defined(USE_AURA)

626 return ui::ActiveWindowWatcherX::WMSupportsActivation();	626 return ui::ActiveWindowWatcherX::WMSupportsActivation();

627 #else	627 #else

628 return true;	628 return true;

629 #endif	629 #endif

630 }	630 }

OLD	NEW