OLD | NEW |
1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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 #import "chrome/browser/ui/cocoa/extensions/toolbar_actions_bar_bubble_mac.h" | 5 #import "chrome/browser/ui/cocoa/extensions/toolbar_actions_bar_bubble_mac.h" |
6 | 6 |
7 #include "base/mac/foundation_util.h" | 7 #include "base/mac/foundation_util.h" |
8 #include "base/strings/sys_string_conversions.h" | 8 #include "base/strings/sys_string_conversions.h" |
9 #import "chrome/browser/ui/cocoa/info_bubble_view.h" | 9 #import "chrome/browser/ui/cocoa/info_bubble_view.h" |
10 #import "chrome/browser/ui/cocoa/info_bubble_window.h" | 10 #import "chrome/browser/ui/cocoa/info_bubble_window.h" |
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
69 defer:NO]); | 69 defer:NO]); |
70 if ((self = [super initWithWindow:window | 70 if ((self = [super initWithWindow:window |
71 parentWindow:parentWindow | 71 parentWindow:parentWindow |
72 anchoredAt:anchorPoint])) { | 72 anchoredAt:anchorPoint])) { |
73 acknowledged_ = NO; | 73 acknowledged_ = NO; |
74 [window setInfoBubbleCanBecomeKeyWindow:NO]; | 74 [window setInfoBubbleCanBecomeKeyWindow:NO]; |
75 delegate_ = delegate.Pass(); | 75 delegate_ = delegate.Pass(); |
76 | 76 |
77 ui::NativeTheme* nativeTheme = ui::NativeTheme::instance(); | 77 ui::NativeTheme* nativeTheme = ui::NativeTheme::instance(); |
78 [[self bubble] setAlignment:info_bubble::kAlignArrowToAnchor]; | 78 [[self bubble] setAlignment:info_bubble::kAlignArrowToAnchor]; |
79 [[self bubble] setArrowLocation:info_bubble::kTopRight]; | 79 [[self bubble] setArrowLocation:views::BubbleBorder::TOP_RIGHT]; |
80 [[self bubble] setBackgroundColor: | 80 [[self bubble] setBackgroundColor: |
81 gfx::SkColorToCalibratedNSColor(nativeTheme->GetSystemColor( | 81 gfx::SkColorToCalibratedNSColor(nativeTheme->GetSystemColor( |
82 ui::NativeTheme::kColorId_DialogBackground))]; | 82 ui::NativeTheme::kColorId_DialogBackground))]; |
83 | 83 |
84 if (!g_animations_enabled) | 84 if (!g_animations_enabled) |
85 [window setAllowedAnimations:info_bubble::kAnimateNone]; | 85 [window setAllowedAnimations:info_bubble::kAnimateNone]; |
86 | 86 |
87 [self layout]; | 87 [self layout]; |
88 } | 88 } |
89 return self; | 89 return self; |
(...skipping 238 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
328 } else { | 328 } else { |
329 DCHECK_EQ(sender, actionButton_); | 329 DCHECK_EQ(sender, actionButton_); |
330 action = ToolbarActionsBarBubbleDelegate::CLOSE_EXECUTE; | 330 action = ToolbarActionsBarBubbleDelegate::CLOSE_EXECUTE; |
331 } | 331 } |
332 acknowledged_ = YES; | 332 acknowledged_ = YES; |
333 delegate_->OnBubbleClosed(action); | 333 delegate_->OnBubbleClosed(action); |
334 [self close]; | 334 [self close]; |
335 } | 335 } |
336 | 336 |
337 @end | 337 @end |
OLD | NEW |