| 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 126 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 137 | 137 |
| 138 #if defined(USE_ASH) | 138 #if defined(USE_ASH) |
| 139 #include "ash/ash_switches.h" | 139 #include "ash/ash_switches.h" |
| 140 #include "ash/shelf/shelf.h" | 140 #include "ash/shelf/shelf.h" |
| 141 #include "ash/shelf/shelf_model.h" | 141 #include "ash/shelf/shelf_model.h" |
| 142 #include "ash/shell.h" | 142 #include "ash/shell.h" |
| 143 #include "chrome/browser/ui/ash/ash_util.h" | 143 #include "chrome/browser/ui/ash/ash_util.h" |
| 144 #endif | 144 #endif |
| 145 | 145 |
| 146 #if defined(USE_AURA) | 146 #if defined(USE_AURA) |
| 147 #include "ui/aura/root_window.h" | |
| 148 #include "ui/aura/window.h" | 147 #include "ui/aura/window.h" |
| 148 #include "ui/aura/window_event_dispatcher.h" |
| 149 #include "ui/gfx/screen.h" | 149 #include "ui/gfx/screen.h" |
| 150 #endif | 150 #endif |
| 151 | 151 |
| 152 #if defined(OS_WIN) | 152 #if defined(OS_WIN) |
| 153 #include "base/win/windows_version.h" | 153 #include "base/win/windows_version.h" |
| 154 #include "chrome/browser/jumplist_win.h" | 154 #include "chrome/browser/jumplist_win.h" |
| 155 #include "ui/views/win/scoped_fullscreen_visibility.h" | 155 #include "ui/views/win/scoped_fullscreen_visibility.h" |
| 156 #include "win8/util/win8_util.h" | 156 #include "win8/util/win8_util.h" |
| 157 #endif | 157 #endif |
| 158 | 158 |
| (...skipping 2412 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2571 !GetLocationBar()->GetOmniboxView()->model()->popup_model()->IsOpen()) { | 2571 !GetLocationBar()->GetOmniboxView()->model()->popup_model()->IsOpen()) { |
| 2572 gfx::Point icon_bottom( | 2572 gfx::Point icon_bottom( |
| 2573 toolbar_->location_bar()->GetLocationBarAnchorPoint()); | 2573 toolbar_->location_bar()->GetLocationBarAnchorPoint()); |
| 2574 ConvertPointToTarget(toolbar_->location_bar(), this, &icon_bottom); | 2574 ConvertPointToTarget(toolbar_->location_bar(), this, &icon_bottom); |
| 2575 gfx::Point infobar_top(0, infobar_container_->GetVerticalOverlap(NULL)); | 2575 gfx::Point infobar_top(0, infobar_container_->GetVerticalOverlap(NULL)); |
| 2576 ConvertPointToTarget(infobar_container_, this, &infobar_top); | 2576 ConvertPointToTarget(infobar_container_, this, &infobar_top); |
| 2577 top_arrow_height = infobar_top.y() - icon_bottom.y(); | 2577 top_arrow_height = infobar_top.y() - icon_bottom.y(); |
| 2578 } | 2578 } |
| 2579 return top_arrow_height; | 2579 return top_arrow_height; |
| 2580 } | 2580 } |
| OLD | NEW |