Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(520)

Side by Side Diff: chrome/browser/ui/views/toolbar/extension_toolbar_menu_view.cc

Issue 661493004: Add infrastructure for Chrome Actions (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/extension_toolbar_menu_view.h" 5 #include "chrome/browser/ui/views/toolbar/extension_toolbar_menu_view.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/message_loop/message_loop.h" 8 #include "base/message_loop/message_loop.h"
9 #include "base/time/time.h" 9 #include "base/time/time.h"
10 #include "chrome/browser/ui/views/frame/browser_view.h" 10 #include "chrome/browser/ui/views/frame/browser_view.h"
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
51 browser_actions_container_observer_.Add(container_); 51 browser_actions_container_observer_.Add(container_);
52 browser_actions_container_observer_.Add(main); 52 browser_actions_container_observer_.Add(main);
53 } 53 }
54 } 54 }
55 55
56 ExtensionToolbarMenuView::~ExtensionToolbarMenuView() { 56 ExtensionToolbarMenuView::~ExtensionToolbarMenuView() {
57 } 57 }
58 58
59 bool ExtensionToolbarMenuView::ShouldShow() { 59 bool ExtensionToolbarMenuView::ShouldShow() {
60 return wrench_menu_->for_drop() || 60 return wrench_menu_->for_drop() ||
61 container_->VisibleBrowserActionsAfterAnimation(); 61 container_->VisibleBrowserActionsAfterAnimation() ||
62 container_->num_chrome_actions() != 0u;
62 } 63 }
63 64
64 gfx::Size ExtensionToolbarMenuView::GetPreferredSize() const { 65 gfx::Size ExtensionToolbarMenuView::GetPreferredSize() const {
65 return container_->GetPreferredSize(); 66 return container_->GetPreferredSize();
66 } 67 }
67 68
68 int ExtensionToolbarMenuView::GetHeightForWidth(int width) const { 69 int ExtensionToolbarMenuView::GetHeightForWidth(int width) const {
69 const views::MenuConfig& menu_config = 70 const views::MenuConfig& menu_config =
70 static_cast<const views::MenuItemView*>(parent())->GetMenuConfig(); 71 static_cast<const views::MenuItemView*>(parent())->GetMenuConfig();
71 int end_padding = menu_config.arrow_to_edge_padding - 72 int end_padding = menu_config.arrow_to_edge_padding -
(...skipping 19 matching lines...) Expand all
91 base::MessageLoop::current()->PostDelayedTask( 92 base::MessageLoop::current()->PostDelayedTask(
92 FROM_HERE, 93 FROM_HERE,
93 base::Bind(&ExtensionToolbarMenuView::CloseWrenchMenu, 94 base::Bind(&ExtensionToolbarMenuView::CloseWrenchMenu,
94 weak_factory_.GetWeakPtr()), 95 weak_factory_.GetWeakPtr()),
95 base::TimeDelta::FromMilliseconds(kCloseMenuDelay)); 96 base::TimeDelta::FromMilliseconds(kCloseMenuDelay));
96 } 97 }
97 98
98 void ExtensionToolbarMenuView::CloseWrenchMenu() { 99 void ExtensionToolbarMenuView::CloseWrenchMenu() {
99 wrench_menu_->CloseMenu(); 100 wrench_menu_->CloseMenu();
100 } 101 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698