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/views/frame/browser_view.h" | 5 #include "chrome/browser/ui/views/frame/browser_view.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 | 8 |
9 #include "base/auto_reset.h" | 9 #include "base/auto_reset.h" |
10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
42 #include "chrome/browser/ui/bookmarks/bookmark_bar_constants.h" | 42 #include "chrome/browser/ui/bookmarks/bookmark_bar_constants.h" |
43 #include "chrome/browser/ui/bookmarks/bookmark_bubble_delegate.h" | 43 #include "chrome/browser/ui/bookmarks/bookmark_bubble_delegate.h" |
44 #include "chrome/browser/ui/bookmarks/bookmark_bubble_sign_in_delegate.h" | 44 #include "chrome/browser/ui/bookmarks/bookmark_bubble_sign_in_delegate.h" |
45 #include "chrome/browser/ui/browser.h" | 45 #include "chrome/browser/ui/browser.h" |
46 #include "chrome/browser/ui/browser_command_controller.h" | 46 #include "chrome/browser/ui/browser_command_controller.h" |
47 #include "chrome/browser/ui/browser_commands.h" | 47 #include "chrome/browser/ui/browser_commands.h" |
48 #include "chrome/browser/ui/browser_dialogs.h" | 48 #include "chrome/browser/ui/browser_dialogs.h" |
49 #include "chrome/browser/ui/browser_finder.h" | 49 #include "chrome/browser/ui/browser_finder.h" |
50 #include "chrome/browser/ui/browser_list.h" | 50 #include "chrome/browser/ui/browser_list.h" |
51 #include "chrome/browser/ui/browser_window_state.h" | 51 #include "chrome/browser/ui/browser_window_state.h" |
52 #include "chrome/browser/ui/ntp_background_util.h" | |
53 #include "chrome/browser/ui/omnibox/omnibox_popup_model.h" | 52 #include "chrome/browser/ui/omnibox/omnibox_popup_model.h" |
54 #include "chrome/browser/ui/omnibox/omnibox_popup_view.h" | 53 #include "chrome/browser/ui/omnibox/omnibox_popup_view.h" |
55 #include "chrome/browser/ui/omnibox/omnibox_view.h" | 54 #include "chrome/browser/ui/omnibox/omnibox_view.h" |
56 #include "chrome/browser/ui/search/search_delegate.h" | 55 #include "chrome/browser/ui/search/search_delegate.h" |
57 #include "chrome/browser/ui/search/search_model.h" | 56 #include "chrome/browser/ui/search/search_model.h" |
58 #include "chrome/browser/ui/search/search_ui.h" | 57 #include "chrome/browser/ui/search/search_ui.h" |
59 #include "chrome/browser/ui/tabs/tab_menu_model.h" | 58 #include "chrome/browser/ui/tabs/tab_menu_model.h" |
60 #include "chrome/browser/ui/tabs/tab_strip_model.h" | 59 #include "chrome/browser/ui/tabs/tab_strip_model.h" |
61 #include "chrome/browser/ui/view_ids.h" | 60 #include "chrome/browser/ui/view_ids.h" |
62 #include "chrome/browser/ui/views/accelerator_table.h" | 61 #include "chrome/browser/ui/views/accelerator_table.h" |
(...skipping 2473 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2536 !GetLocationBar()->GetOmniboxView()->model()->popup_model()->IsOpen()) { | 2535 !GetLocationBar()->GetOmniboxView()->model()->popup_model()->IsOpen()) { |
2537 gfx::Point icon_bottom( | 2536 gfx::Point icon_bottom( |
2538 toolbar_->location_bar()->GetLocationBarAnchorPoint()); | 2537 toolbar_->location_bar()->GetLocationBarAnchorPoint()); |
2539 ConvertPointToTarget(toolbar_->location_bar(), this, &icon_bottom); | 2538 ConvertPointToTarget(toolbar_->location_bar(), this, &icon_bottom); |
2540 gfx::Point infobar_top(0, infobar_container_->GetVerticalOverlap(NULL)); | 2539 gfx::Point infobar_top(0, infobar_container_->GetVerticalOverlap(NULL)); |
2541 ConvertPointToTarget(infobar_container_, this, &infobar_top); | 2540 ConvertPointToTarget(infobar_container_, this, &infobar_top); |
2542 top_arrow_height = infobar_top.y() - icon_bottom.y(); | 2541 top_arrow_height = infobar_top.y() - icon_bottom.y(); |
2543 } | 2542 } |
2544 return top_arrow_height; | 2543 return top_arrow_height; |
2545 } | 2544 } |
OLD | NEW |