| 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 83 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 94 #include "chrome/browser/ui/views/update_recommended_message_box.h" | 94 #include "chrome/browser/ui/views/update_recommended_message_box.h" |
| 95 #include "chrome/browser/ui/views/website_settings/permissions_bubble_view.h" | 95 #include "chrome/browser/ui/views/website_settings/permissions_bubble_view.h" |
| 96 #include "chrome/browser/ui/views/website_settings/website_settings_popup_view.h
" | 96 #include "chrome/browser/ui/views/website_settings/website_settings_popup_view.h
" |
| 97 #include "chrome/browser/ui/website_settings/permission_bubble_manager.h" | 97 #include "chrome/browser/ui/website_settings/permission_bubble_manager.h" |
| 98 #include "chrome/browser/ui/window_sizer/window_sizer.h" | 98 #include "chrome/browser/ui/window_sizer/window_sizer.h" |
| 99 #include "chrome/common/chrome_switches.h" | 99 #include "chrome/common/chrome_switches.h" |
| 100 #include "chrome/common/pref_names.h" | 100 #include "chrome/common/pref_names.h" |
| 101 #include "chrome/common/url_constants.h" | 101 #include "chrome/common/url_constants.h" |
| 102 #include "components/password_manager/core/browser/password_manager.h" | 102 #include "components/password_manager/core/browser/password_manager.h" |
| 103 #include "components/signin/core/common/profile_management_switches.h" | 103 #include "components/signin/core/common/profile_management_switches.h" |
| 104 #include "components/translate/core/browser/language_state.h" |
| 104 #include "content/public/browser/download_manager.h" | 105 #include "content/public/browser/download_manager.h" |
| 105 #include "content/public/browser/native_web_keyboard_event.h" | 106 #include "content/public/browser/native_web_keyboard_event.h" |
| 106 #include "content/public/browser/notification_service.h" | 107 #include "content/public/browser/notification_service.h" |
| 107 #include "content/public/browser/render_frame_host.h" | 108 #include "content/public/browser/render_frame_host.h" |
| 108 #include "content/public/browser/render_view_host.h" | 109 #include "content/public/browser/render_view_host.h" |
| 109 #include "content/public/browser/user_metrics.h" | 110 #include "content/public/browser/user_metrics.h" |
| 110 #include "content/public/browser/web_contents.h" | 111 #include "content/public/browser/web_contents.h" |
| 111 #include "content/public/common/content_switches.h" | 112 #include "content/public/common/content_switches.h" |
| 112 #include "grit/chromium_strings.h" | 113 #include "grit/chromium_strings.h" |
| 113 #include "grit/generated_resources.h" | 114 #include "grit/generated_resources.h" |
| (...skipping 2433 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2547 !GetLocationBar()->GetOmniboxView()->model()->popup_model()->IsOpen()) { | 2548 !GetLocationBar()->GetOmniboxView()->model()->popup_model()->IsOpen()) { |
| 2548 gfx::Point icon_bottom( | 2549 gfx::Point icon_bottom( |
| 2549 toolbar_->location_bar()->GetLocationBarAnchorPoint()); | 2550 toolbar_->location_bar()->GetLocationBarAnchorPoint()); |
| 2550 ConvertPointToTarget(toolbar_->location_bar(), this, &icon_bottom); | 2551 ConvertPointToTarget(toolbar_->location_bar(), this, &icon_bottom); |
| 2551 gfx::Point infobar_top(0, infobar_container_->GetVerticalOverlap(NULL)); | 2552 gfx::Point infobar_top(0, infobar_container_->GetVerticalOverlap(NULL)); |
| 2552 ConvertPointToTarget(infobar_container_, this, &infobar_top); | 2553 ConvertPointToTarget(infobar_container_, this, &infobar_top); |
| 2553 top_arrow_height = infobar_top.y() - icon_bottom.y(); | 2554 top_arrow_height = infobar_top.y() - icon_bottom.y(); |
| 2554 } | 2555 } |
| 2555 return top_arrow_height; | 2556 return top_arrow_height; |
| 2556 } | 2557 } |
| OLD | NEW |