OLD | NEW |
1 // Copyright 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 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 <string> | 5 #include <string> |
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/compiler_specific.h" | 9 #include "base/compiler_specific.h" |
10 #include "base/files/file_path.h" | 10 #include "base/files/file_path.h" |
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
94 #include "extensions/browser/extension_system.h" | 94 #include "extensions/browser/extension_system.h" |
95 #include "extensions/browser/uninstall_reason.h" | 95 #include "extensions/browser/uninstall_reason.h" |
96 #include "extensions/common/constants.h" | 96 #include "extensions/common/constants.h" |
97 #include "extensions/common/extension.h" | 97 #include "extensions/common/extension.h" |
98 #include "extensions/common/extension_set.h" | 98 #include "extensions/common/extension_set.h" |
99 #include "net/base/net_errors.h" | 99 #include "net/base/net_errors.h" |
100 #include "net/dns/mock_host_resolver.h" | 100 #include "net/dns/mock_host_resolver.h" |
101 #include "net/test/spawned_test_server/spawned_test_server.h" | 101 #include "net/test/spawned_test_server/spawned_test_server.h" |
102 #include "ui/base/l10n/l10n_util.h" | 102 #include "ui/base/l10n/l10n_util.h" |
103 #include "ui/base/page_transition_types.h" | 103 #include "ui/base/page_transition_types.h" |
| 104 #include "ui/gfx/host_desktop_type.h" |
104 | 105 |
105 #if defined(OS_MACOSX) | 106 #if defined(OS_MACOSX) |
106 #include "base/mac/mac_util.h" | 107 #include "base/mac/mac_util.h" |
107 #include "base/mac/scoped_nsautorelease_pool.h" | 108 #include "base/mac/scoped_nsautorelease_pool.h" |
108 #include "chrome/browser/ui/cocoa/run_loop_testing.h" | 109 #include "chrome/browser/ui/cocoa/run_loop_testing.h" |
109 #endif | 110 #endif |
110 | 111 |
111 #if defined(OS_WIN) | 112 #if defined(OS_WIN) |
112 #include "base/i18n/rtl.h" | 113 #include "base/i18n/rtl.h" |
113 #include "chrome/browser/browser_process.h" | 114 #include "chrome/browser/browser_process.h" |
(...skipping 3072 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3186 | 3187 |
3187 // Sync navigation just to make sure IPC has passed (updated | 3188 // Sync navigation just to make sure IPC has passed (updated |
3188 // display mode is delivered to RP). | 3189 // display mode is delivered to RP). |
3189 content::TestNavigationObserver observer(app_contents, 1); | 3190 content::TestNavigationObserver observer(app_contents, 1); |
3190 ui_test_utils::NavigateToURL(app_browser, GURL(url::kAboutBlankURL)); | 3191 ui_test_utils::NavigateToURL(app_browser, GURL(url::kAboutBlankURL)); |
3191 observer.Wait(); | 3192 observer.Wait(); |
3192 | 3193 |
3193 CheckDisplayModeMQ(ASCIIToUTF16("fullscreen"), app_contents); | 3194 CheckDisplayModeMQ(ASCIIToUTF16("fullscreen"), app_contents); |
3194 } | 3195 } |
3195 | 3196 |
OLD | NEW |