| 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/views/frame/browser_view.h" | 5 #include "chrome/browser/ui/views/frame/browser_view.h" |
| 6 | 6 |
| 7 #include "chrome/app/chrome_command_ids.h" | 7 #include "chrome/app/chrome_command_ids.h" |
| 8 #include "chrome/browser/autocomplete/autocomplete_controller.h" | 8 #include "chrome/browser/autocomplete/autocomplete_controller.h" |
| 9 #include "chrome/browser/search/search.h" | 9 #include "chrome/browser/search/search.h" |
| 10 #include "chrome/browser/ui/browser_commands.h" | 10 #include "chrome/browser/ui/browser_commands.h" |
| (...skipping 11 matching lines...) Expand all Loading... |
| 22 #include "chrome/browser/ui/views/toolbar_view.h" | 22 #include "chrome/browser/ui/views/toolbar_view.h" |
| 23 #include "chrome/common/instant_types.h" | 23 #include "chrome/common/instant_types.h" |
| 24 #include "chrome/common/url_constants.h" | 24 #include "chrome/common/url_constants.h" |
| 25 #include "chrome/test/base/in_process_browser_test.h" | 25 #include "chrome/test/base/in_process_browser_test.h" |
| 26 #include "chrome/test/base/ui_test_utils.h" | 26 #include "chrome/test/base/ui_test_utils.h" |
| 27 #include "ui/views/controls/webview/webview.h" | 27 #include "ui/views/controls/webview/webview.h" |
| 28 #include "ui/views/focus/focus_manager.h" | 28 #include "ui/views/focus/focus_manager.h" |
| 29 #include "ui/views/window/non_client_view.h" | 29 #include "ui/views/window/non_client_view.h" |
| 30 | 30 |
| 31 #if defined(OS_CHROMEOS) | 31 #if defined(OS_CHROMEOS) |
| 32 #include "chrome/common/chrome_notification_types.h" | 32 #include "chrome/browser/chrome_notification_types.h" |
| 33 #include "content/public/browser/notification_service.h" | 33 #include "content/public/browser/notification_service.h" |
| 34 #include "ui/compositor/layer.h" | 34 #include "ui/compositor/layer.h" |
| 35 #include "ui/compositor/scoped_animation_duration_scale_mode.h" | 35 #include "ui/compositor/scoped_animation_duration_scale_mode.h" |
| 36 #endif | 36 #endif |
| 37 | 37 |
| 38 using views::FocusManager; | 38 using views::FocusManager; |
| 39 | 39 |
| 40 namespace { | 40 namespace { |
| 41 | 41 |
| 42 // Returns the bounds of |view| in widget coordinates. | 42 // Returns the bounds of |view| in widget coordinates. |
| (...skipping 237 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 280 // The active web contents are aligned with the toolbar. | 280 // The active web contents are aligned with the toolbar. |
| 281 gfx::Rect web_view_rect_in_widget = GetRectInWidget( | 281 gfx::Rect web_view_rect_in_widget = GetRectInWidget( |
| 282 browser_view->GetContentsContainerForTest()->GetActiveWebViewForTest()); | 282 browser_view->GetContentsContainerForTest()->GetActiveWebViewForTest()); |
| 283 EXPECT_EQ(GetRectInWidget(toolbar).bottom(), web_view_rect_in_widget.y()); | 283 EXPECT_EQ(GetRectInWidget(toolbar).bottom(), web_view_rect_in_widget.y()); |
| 284 | 284 |
| 285 BookmarkBarView::DisableAnimationsForTesting(false); | 285 BookmarkBarView::DisableAnimationsForTesting(false); |
| 286 } | 286 } |
| 287 | 287 |
| 288 #endif // defined(OS_CHROMEOS) | 288 #endif // defined(OS_CHROMEOS) |
| 289 #endif // defined(HTML_INSTANT_EXTENDED_POPUP) | 289 #endif // defined(HTML_INSTANT_EXTENDED_POPUP) |
| OLD | NEW |