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/toolbar_view.h" | 5 #include "chrome/browser/ui/views/toolbar_view.h" |
6 | 6 |
7 #include "base/i18n/number_formatting.h" | 7 #include "base/i18n/number_formatting.h" |
8 #include "base/utf_string_conversions.h" | 8 #include "base/utf_string_conversions.h" |
9 #include "chrome/app/chrome_command_ids.h" | 9 #include "chrome/app/chrome_command_ids.h" |
10 #include "chrome/browser/command_updater.h" | 10 #include "chrome/browser/command_updater.h" |
(...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
110 gfx::ImageSkia* kPopupBackgroundEdge = NULL; | 110 gfx::ImageSkia* kPopupBackgroundEdge = NULL; |
111 | 111 |
112 // The omnibox border has some additional shadow, so we use less vertical | 112 // The omnibox border has some additional shadow, so we use less vertical |
113 // spacing than ToolbarView::kVertSpacing. | 113 // spacing than ToolbarView::kVertSpacing. |
114 int location_bar_vert_spacing() { | 114 int location_bar_vert_spacing() { |
115 static int value = -1; | 115 static int value = -1; |
116 if (value == -1) { | 116 if (value == -1) { |
117 switch (ui::GetDisplayLayout()) { | 117 switch (ui::GetDisplayLayout()) { |
118 case ui::LAYOUT_ASH: | 118 case ui::LAYOUT_ASH: |
119 case ui::LAYOUT_DESKTOP: | 119 case ui::LAYOUT_DESKTOP: |
120 value = 4; | 120 value = 5; |
121 break; | 121 break; |
122 case ui::LAYOUT_TOUCH: | 122 case ui::LAYOUT_TOUCH: |
123 value = 6; | 123 value = 6; |
124 break; | 124 break; |
125 default: | 125 default: |
126 NOTREACHED(); | 126 NOTREACHED(); |
127 } | 127 } |
128 } | 128 } |
129 return value; | 129 return value; |
130 } | 130 } |
(...skipping 882 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1013 // LocationBarContainer is not a child of the ToolbarView. | 1013 // LocationBarContainer is not a child of the ToolbarView. |
1014 gfx::Point origin(bounds.origin()); | 1014 gfx::Point origin(bounds.origin()); |
1015 views::View::ConvertPointToTarget(this, location_bar_container_->parent(), | 1015 views::View::ConvertPointToTarget(this, location_bar_container_->parent(), |
1016 &origin); | 1016 &origin); |
1017 gfx::Rect target_bounds(origin, bounds.size()); | 1017 gfx::Rect target_bounds(origin, bounds.size()); |
1018 if (location_bar_container_->GetTargetBounds() != target_bounds) { | 1018 if (location_bar_container_->GetTargetBounds() != target_bounds) { |
1019 location_bar_container_->SetInToolbar(true); | 1019 location_bar_container_->SetInToolbar(true); |
1020 location_bar_container_->SetBoundsRect(target_bounds); | 1020 location_bar_container_->SetBoundsRect(target_bounds); |
1021 } | 1021 } |
1022 } | 1022 } |
OLD | NEW |