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

Unified Diff: ash/system/palette/palette_tray.cc

Issue 2948223002: Revert of Do not activate TrayBubbleView by default (Closed)
Patch Set: Created 3 years, 6 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/system/palette/palette_tray.h ('k') | ash/system/tray/system_tray.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/system/palette/palette_tray.cc
diff --git a/ash/system/palette/palette_tray.cc b/ash/system/palette/palette_tray.cc
index c7da960ac4c17e251bf3cd51e389534e0df41df2..79c3677b2d9e6daeed47fc392623f78af7e0577e 100644
--- a/ash/system/palette/palette_tray.cc
+++ b/ash/system/palette/palette_tray.cc
@@ -4,8 +4,6 @@
#include "ash/system/palette/palette_tray.h"
-#include "ash/accelerators/accelerator_controller.h"
-#include "ash/accessibility_delegate.h"
#include "ash/resources/vector_icons/vector_icons.h"
#include "ash/root_window_controller.h"
#include "ash/session/session_controller.h"
@@ -157,7 +155,7 @@
PaletteTray::~PaletteTray() {
if (bubble_)
- bubble_->bubble_view()->ResetDelegate();
+ bubble_->bubble_view()->reset_delegate();
ui::InputDeviceManager::GetInstance()->RemoveObserver(this);
Shell::Get()->RemoveShellObserver(this);
@@ -187,6 +185,7 @@
init_params.anchor_alignment = GetAnchorAlignment();
init_params.min_width = kPaletteWidth;
init_params.max_width = kPaletteWidth;
+ init_params.can_activate = true;
init_params.close_on_deactivate = true;
// TODO(tdanderson): Refactor into common row layout code.
@@ -300,24 +299,8 @@
void PaletteTray::OnMouseExitedView() {}
-void PaletteTray::RegisterAccelerators(
- const std::vector<ui::Accelerator>& accelerators,
- views::TrayBubbleView* tray_bubble_view) {
- Shell::Get()->accelerator_controller()->Register(accelerators,
- tray_bubble_view);
-}
-
-void PaletteTray::UnregisterAllAccelerators(
- views::TrayBubbleView* tray_bubble_view) {
- Shell::Get()->accelerator_controller()->UnregisterAll(tray_bubble_view);
-}
-
base::string16 PaletteTray::GetAccessibleNameForBubble() {
return GetAccessibleNameForTray();
-}
-
-bool PaletteTray::ShouldEnableExtraKeyboardAccessibility() {
- return Shell::Get()->accessibility_delegate()->IsSpokenFeedbackEnabled();
}
void PaletteTray::HideBubble(const views::TrayBubbleView* bubble_view) {
« no previous file with comments | « ash/system/palette/palette_tray.h ('k') | ash/system/tray/system_tray.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698