| 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 "chrome/browser/ui/views/infobars/infobar_view.h" | 5 #include "chrome/browser/ui/views/infobars/infobar_view.h" |
| 6 | 6 |
| 7 #if defined(OS_WIN) | 7 #if defined(OS_WIN) |
| 8 #include <shellapi.h> | 8 #include <shellapi.h> |
| 9 #endif | 9 #endif |
| 10 | 10 |
| (...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 43 #include "ui/gfx/icon_util.h" | 43 #include "ui/gfx/icon_util.h" |
| 44 #endif | 44 #endif |
| 45 | 45 |
| 46 // static | 46 // static |
| 47 const int InfoBar::kSeparatorLineHeight = | 47 const int InfoBar::kSeparatorLineHeight = |
| 48 views::NonClientFrameView::kClientEdgeThickness; | 48 views::NonClientFrameView::kClientEdgeThickness; |
| 49 const int InfoBar::kDefaultArrowTargetHeight = 9; | 49 const int InfoBar::kDefaultArrowTargetHeight = 9; |
| 50 const int InfoBar::kMaximumArrowTargetHeight = 24; | 50 const int InfoBar::kMaximumArrowTargetHeight = 24; |
| 51 const int InfoBar::kDefaultArrowTargetHalfWidth = kDefaultArrowTargetHeight; | 51 const int InfoBar::kDefaultArrowTargetHalfWidth = kDefaultArrowTargetHeight; |
| 52 const int InfoBar::kMaximumArrowTargetHalfWidth = 14; | 52 const int InfoBar::kMaximumArrowTargetHalfWidth = 14; |
| 53 | |
| 54 #ifdef TOUCH_UI | |
| 55 const int InfoBar::kDefaultBarTargetHeight = 75; | |
| 56 #else | |
| 57 const int InfoBar::kDefaultBarTargetHeight = 36; | 53 const int InfoBar::kDefaultBarTargetHeight = 36; |
| 58 #endif | |
| 59 | 54 |
| 60 const int InfoBarView::kButtonButtonSpacing = 10; | 55 const int InfoBarView::kButtonButtonSpacing = 10; |
| 61 const int InfoBarView::kEndOfLabelSpacing = 16; | 56 const int InfoBarView::kEndOfLabelSpacing = 16; |
| 62 const int InfoBarView::kHorizontalPadding = 6; | 57 const int InfoBarView::kHorizontalPadding = 6; |
| 63 | 58 |
| 64 InfoBarView::InfoBarView(InfoBarTabHelper* owner, InfoBarDelegate* delegate) | 59 InfoBarView::InfoBarView(InfoBarTabHelper* owner, InfoBarDelegate* delegate) |
| 65 : InfoBar(owner, delegate), | 60 : InfoBar(owner, delegate), |
| 66 icon_(NULL), | 61 icon_(NULL), |
| 67 close_button_(NULL) { | 62 close_button_(NULL) { |
| 68 set_parent_owned(false); // InfoBar deletes itself at the appropriate time. | 63 set_parent_owned(false); // InfoBar deletes itself at the appropriate time. |
| (...skipping 311 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 380 // infobar. | 375 // infobar. |
| 381 if (focused_before && focused_now && !Contains(focused_before) && | 376 if (focused_before && focused_now && !Contains(focused_before) && |
| 382 Contains(focused_now) && GetWidget()) { | 377 Contains(focused_now) && GetWidget()) { |
| 383 GetWidget()->NotifyAccessibilityEvent( | 378 GetWidget()->NotifyAccessibilityEvent( |
| 384 this, ui::AccessibilityTypes::EVENT_ALERT, true); | 379 this, ui::AccessibilityTypes::EVENT_ALERT, true); |
| 385 } | 380 } |
| 386 } | 381 } |
| 387 | 382 |
| 388 void InfoBarView::OnDidChangeFocus(View* focused_before, View* focused_now) { | 383 void InfoBarView::OnDidChangeFocus(View* focused_before, View* focused_now) { |
| 389 } | 384 } |
| OLD | NEW |