| 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 75 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 86 browser->profile(), | 86 browser->profile(), |
| 87 owner_view->GetFocusManager(), | 87 owner_view->GetFocusManager(), |
| 88 extensions::ExtensionKeybindingRegistry::ALL_EXTENSIONS, | 88 extensions::ExtensionKeybindingRegistry::ALL_EXTENSIONS, |
| 89 this)); | 89 this)); |
| 90 | 90 |
| 91 resize_animation_.reset(new gfx::SlideAnimation(this)); | 91 resize_animation_.reset(new gfx::SlideAnimation(this)); |
| 92 resize_area_ = new views::ResizeArea(this); | 92 resize_area_ = new views::ResizeArea(this); |
| 93 AddChildView(resize_area_); | 93 AddChildView(resize_area_); |
| 94 | 94 |
| 95 chevron_ = new views::MenuButton(NULL, base::string16(), this, false); | 95 chevron_ = new views::MenuButton(NULL, base::string16(), this, false); |
| 96 chevron_->set_border(NULL); | 96 chevron_->SetBorder(views::Border::NullBorder()); |
| 97 chevron_->EnableCanvasFlippingForRTLUI(true); | 97 chevron_->EnableCanvasFlippingForRTLUI(true); |
| 98 chevron_->SetAccessibleName( | 98 chevron_->SetAccessibleName( |
| 99 l10n_util::GetStringUTF16(IDS_ACCNAME_EXTENSIONS_CHEVRON)); | 99 l10n_util::GetStringUTF16(IDS_ACCNAME_EXTENSIONS_CHEVRON)); |
| 100 chevron_->SetVisible(false); | 100 chevron_->SetVisible(false); |
| 101 AddChildView(chevron_); | 101 AddChildView(chevron_); |
| 102 } | 102 } |
| 103 | 103 |
| 104 BrowserActionsContainer::~BrowserActionsContainer() { | 104 BrowserActionsContainer::~BrowserActionsContainer() { |
| 105 if (overflow_menu_) | 105 if (overflow_menu_) |
| 106 overflow_menu_->set_observer(NULL); | 106 overflow_menu_->set_observer(NULL); |
| (...skipping 761 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 868 arrow, | 868 arrow, |
| 869 show_action); | 869 show_action); |
| 870 popup_->GetWidget()->AddObserver(this); | 870 popup_->GetWidget()->AddObserver(this); |
| 871 popup_button_ = button; | 871 popup_button_ = button; |
| 872 | 872 |
| 873 // Only set button as pushed if it was triggered by a user click. | 873 // Only set button as pushed if it was triggered by a user click. |
| 874 if (should_grant) | 874 if (should_grant) |
| 875 popup_button_->SetButtonPushed(); | 875 popup_button_->SetButtonPushed(); |
| 876 return true; | 876 return true; |
| 877 } | 877 } |
| OLD | NEW |