OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 "base/message_loop.h" | 5 #include "base/message_loop.h" |
6 #include "base/string_util.h" | 6 #include "base/string_util.h" |
7 #include "base/utf_string_conversions.h" | 7 #include "base/utf_string_conversions.h" |
8 #include "chrome/browser/profiles/profile.h" | 8 #include "chrome/browser/profiles/profile.h" |
9 #include "chrome/browser/tabs/tab_strip_model.h" | 9 #include "chrome/browser/tabs/tab_strip_model.h" |
10 #include "chrome/browser/ui/browser.h" | 10 #include "chrome/browser/ui/browser.h" |
(...skipping 12 matching lines...) Expand all Loading... |
23 #include "content/browser/tab_contents/tab_contents_view.h" | 23 #include "content/browser/tab_contents/tab_contents_view.h" |
24 #include "content/public/browser/notification_service.h" | 24 #include "content/public/browser/notification_service.h" |
25 #include "content/public/browser/notification_types.h" | 25 #include "content/public/browser/notification_types.h" |
26 #include "net/test/test_server.h" | 26 #include "net/test/test_server.h" |
27 #include "ui/base/keycodes/keyboard_codes.h" | 27 #include "ui/base/keycodes/keyboard_codes.h" |
28 #include "ui/base/models/accelerator.h" | 28 #include "ui/base/models/accelerator.h" |
29 | 29 |
30 #if defined(TOOLKIT_VIEWS) | 30 #if defined(TOOLKIT_VIEWS) |
31 #include "chrome/browser/ui/views/find_bar_host.h" | 31 #include "chrome/browser/ui/views/find_bar_host.h" |
32 #include "ui/views/focus/focus_manager.h" | 32 #include "ui/views/focus/focus_manager.h" |
33 #include "ui/views/widget/widget.h" | 33 #include "views/widget/widget.h" |
34 #elif defined(TOOLKIT_GTK) | 34 #elif defined(TOOLKIT_GTK) |
35 #include "chrome/browser/ui/gtk/slide_animator_gtk.h" | 35 #include "chrome/browser/ui/gtk/slide_animator_gtk.h" |
36 #elif defined(OS_MACOSX) | 36 #elif defined(OS_MACOSX) |
37 #include "chrome/browser/ui/cocoa/find_bar/find_bar_bridge.h" | 37 #include "chrome/browser/ui/cocoa/find_bar/find_bar_bridge.h" |
38 #endif | 38 #endif |
39 | 39 |
40 const std::string kSimplePage = "404_is_enough_for_us.html"; | 40 const std::string kSimplePage = "404_is_enough_for_us.html"; |
41 const std::string kFramePage = "files/find_in_page/frames.html"; | 41 const std::string kFramePage = "files/find_in_page/frames.html"; |
42 const std::string kFrameData = "files/find_in_page/framedata_general.html"; | 42 const std::string kFrameData = "files/find_in_page/framedata_general.html"; |
43 const std::string kUserSelectPage = "files/find_in_page/user-select.html"; | 43 const std::string kUserSelectPage = "files/find_in_page/user-select.html"; |
(...skipping 1091 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1135 MessageLoop::current()->RunAllPending(); | 1135 MessageLoop::current()->RunAllPending(); |
1136 | 1136 |
1137 EnsureFindBoxOpenForBrowser(popup); | 1137 EnsureFindBoxOpenForBrowser(popup); |
1138 | 1138 |
1139 // GTK adjusts FindBar size asynchronously. | 1139 // GTK adjusts FindBar size asynchronously. |
1140 MessageLoop::current()->RunAllPending(); | 1140 MessageLoop::current()->RunAllPending(); |
1141 | 1141 |
1142 ASSERT_LE(GetFindBarWidthForBrowser(popup), | 1142 ASSERT_LE(GetFindBarWidthForBrowser(popup), |
1143 popup->window()->GetBounds().width()); | 1143 popup->window()->GetBounds().width()); |
1144 } | 1144 } |
OLD | NEW |