| 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 "chrome/browser/ui/browser.h" | 5 #include "chrome/browser/ui/browser.h" |
| 6 | 6 |
| 7 #include <stddef.h> | 7 #include <stddef.h> |
| 8 #include <stdint.h> | 8 #include <stdint.h> |
| 9 | 9 |
| 10 #include <memory> | 10 #include <memory> |
| (...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 109 #include "extensions/common/extension_set.h" | 109 #include "extensions/common/extension_set.h" |
| 110 #include "net/dns/mock_host_resolver.h" | 110 #include "net/dns/mock_host_resolver.h" |
| 111 #include "net/test/embedded_test_server/embedded_test_server.h" | 111 #include "net/test/embedded_test_server/embedded_test_server.h" |
| 112 #include "net/test/embedded_test_server/request_handler_util.h" | 112 #include "net/test/embedded_test_server/request_handler_util.h" |
| 113 #include "net/test/spawned_test_server/spawned_test_server.h" | 113 #include "net/test/spawned_test_server/spawned_test_server.h" |
| 114 #include "ui/base/l10n/l10n_util.h" | 114 #include "ui/base/l10n/l10n_util.h" |
| 115 #include "ui/base/page_transition_types.h" | 115 #include "ui/base/page_transition_types.h" |
| 116 | 116 |
| 117 #if defined(OS_MACOSX) | 117 #if defined(OS_MACOSX) |
| 118 #include "base/mac/scoped_nsautorelease_pool.h" | 118 #include "base/mac/scoped_nsautorelease_pool.h" |
| 119 #include "chrome/browser/ui/cocoa/run_loop_testing.h" | 119 #include "chrome/browser/ui/cocoa/test/run_loop_testing.h" |
| 120 #endif | 120 #endif |
| 121 | 121 |
| 122 #if defined(OS_WIN) | 122 #if defined(OS_WIN) |
| 123 #include "base/i18n/rtl.h" | 123 #include "base/i18n/rtl.h" |
| 124 #include "chrome/browser/browser_process.h" | 124 #include "chrome/browser/browser_process.h" |
| 125 #endif | 125 #endif |
| 126 | 126 |
| 127 using app_modal::AppModalDialog; | 127 using app_modal::AppModalDialog; |
| 128 using app_modal::AppModalDialogQueue; | 128 using app_modal::AppModalDialogQueue; |
| 129 using app_modal::JavaScriptAppModalDialog; | 129 using app_modal::JavaScriptAppModalDialog; |
| (...skipping 2751 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2881 Browser* browser = new Browser(params); | 2881 Browser* browser = new Browser(params); |
| 2882 gfx::Rect bounds = browser->window()->GetBounds(); | 2882 gfx::Rect bounds = browser->window()->GetBounds(); |
| 2883 | 2883 |
| 2884 // Should be EXPECT_EQ, but this width is inconsistent across platforms. | 2884 // Should be EXPECT_EQ, but this width is inconsistent across platforms. |
| 2885 // See https://crbug.com/567925. | 2885 // See https://crbug.com/567925. |
| 2886 EXPECT_GE(bounds.width(), 100); | 2886 EXPECT_GE(bounds.width(), 100); |
| 2887 EXPECT_EQ(122, bounds.height()); | 2887 EXPECT_EQ(122, bounds.height()); |
| 2888 browser->window()->Close(); | 2888 browser->window()->Close(); |
| 2889 } | 2889 } |
| 2890 } | 2890 } |
| OLD | NEW |