| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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/browser_actions_container.h" | 5 #include "chrome/browser/ui/views/toolbar/browser_actions_container.h" |
| 6 | 6 |
| 7 #include "base/compiler_specific.h" | 7 #include "base/compiler_specific.h" |
| 8 #include "base/prefs/pref_service.h" | 8 #include "base/prefs/pref_service.h" |
| 9 #include "base/stl_util.h" | 9 #include "base/stl_util.h" |
| 10 #include "chrome/browser/extensions/extension_service.h" | 10 #include "chrome/browser/extensions/extension_service.h" |
| (...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 85 browser->profile(), | 85 browser->profile(), |
| 86 owner_view->GetFocusManager(), | 86 owner_view->GetFocusManager(), |
| 87 extensions::ExtensionKeybindingRegistry::ALL_EXTENSIONS, | 87 extensions::ExtensionKeybindingRegistry::ALL_EXTENSIONS, |
| 88 this)); | 88 this)); |
| 89 | 89 |
| 90 resize_animation_.reset(new gfx::SlideAnimation(this)); | 90 resize_animation_.reset(new gfx::SlideAnimation(this)); |
| 91 resize_area_ = new views::ResizeArea(this); | 91 resize_area_ = new views::ResizeArea(this); |
| 92 AddChildView(resize_area_); | 92 AddChildView(resize_area_); |
| 93 | 93 |
| 94 chevron_ = new views::MenuButton(NULL, base::string16(), this, false); | 94 chevron_ = new views::MenuButton(NULL, base::string16(), this, false); |
| 95 chevron_->set_border(NULL); | 95 chevron_->ClearBorder(); |
| 96 chevron_->EnableCanvasFlippingForRTLUI(true); | 96 chevron_->EnableCanvasFlippingForRTLUI(true); |
| 97 chevron_->SetAccessibleName( | 97 chevron_->SetAccessibleName( |
| 98 l10n_util::GetStringUTF16(IDS_ACCNAME_EXTENSIONS_CHEVRON)); | 98 l10n_util::GetStringUTF16(IDS_ACCNAME_EXTENSIONS_CHEVRON)); |
| 99 chevron_->SetVisible(false); | 99 chevron_->SetVisible(false); |
| 100 AddChildView(chevron_); | 100 AddChildView(chevron_); |
| 101 } | 101 } |
| 102 | 102 |
| 103 BrowserActionsContainer::~BrowserActionsContainer() { | 103 BrowserActionsContainer::~BrowserActionsContainer() { |
| 104 if (overflow_menu_) | 104 if (overflow_menu_) |
| 105 overflow_menu_->set_observer(NULL); | 105 overflow_menu_->set_observer(NULL); |
| (...skipping 764 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 870 arrow, | 870 arrow, |
| 871 show_action); | 871 show_action); |
| 872 popup_->GetWidget()->AddObserver(this); | 872 popup_->GetWidget()->AddObserver(this); |
| 873 popup_button_ = button; | 873 popup_button_ = button; |
| 874 | 874 |
| 875 // Only set button as pushed if it was triggered by a user click. | 875 // Only set button as pushed if it was triggered by a user click. |
| 876 if (should_grant) | 876 if (should_grant) |
| 877 popup_button_->SetButtonPushed(); | 877 popup_button_->SetButtonPushed(); |
| 878 return true; | 878 return true; |
| 879 } | 879 } |
| OLD | NEW |