diff options
| author | nhiroki@chromium.org <nhiroki@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-30 08:59:30 +0000 |
|---|---|---|
| committer | nhiroki@chromium.org <nhiroki@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-30 08:59:30 +0000 |
| commit | de21b71a964c0bc3cf0df02b501600781f5a8333 (patch) | |
| tree | afd29212ba94472c0c16366655eb1de75f063abb /ash/system | |
| parent | 8796bddeed33e3414118b42f9261d56bb95536e7 (diff) | |
| download | chromium_src-de21b71a964c0bc3cf0df02b501600781f5a8333.zip chromium_src-de21b71a964c0bc3cf0df02b501600781f5a8333.tar.gz chromium_src-de21b71a964c0bc3cf0df02b501600781f5a8333.tar.bz2 | |
Revert 231729 "Focus the default item when the system tray bubbl..."
> Focus the default item when the system tray bubble is created
>
> BUG=304304
>
> Review URL: https://codereview.chromium.org/49003009
TBR=zork@chromium.org
Review URL: https://codereview.chromium.org/52073005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@231778 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/system')
| -rw-r--r-- | ash/system/tray/system_tray.cc | 1 | ||||
| -rw-r--r-- | ash/system/tray/system_tray_bubble.cc | 10 | ||||
| -rw-r--r-- | ash/system/tray/system_tray_bubble.h | 3 |
3 files changed, 0 insertions, 14 deletions
diff --git a/ash/system/tray/system_tray.cc b/ash/system/tray/system_tray.cc index 4782ec3..8020b4f 100644 --- a/ash/system/tray/system_tray.cc +++ b/ash/system/tray/system_tray.cc @@ -99,7 +99,6 @@ class SystemBubbleWrapper { views::BubbleBorder::PAINT_NONE); } is_persistent_ = is_persistent; - bubble_->FocusDefault(); } // Convenience accessors: diff --git a/ash/system/tray/system_tray_bubble.cc b/ash/system/tray/system_tray_bubble.cc index 362e996..3477c3c 100644 --- a/ash/system/tray/system_tray_bubble.cc +++ b/ash/system/tray/system_tray_bubble.cc @@ -271,16 +271,6 @@ void SystemTrayBubble::InitView(views::View* anchor, } } -void SystemTrayBubble::FocusDefault() { - views::FocusManager* manager = bubble_view_->GetFocusManager(); - if (!manager) - return; - - views::View* view = manager->GetNextFocusableView(NULL, NULL, false, false); - if (view) - view->RequestFocus(); -} - void SystemTrayBubble::DestroyItemViews() { for (std::vector<ash::SystemTrayItem*>::iterator it = items_.begin(); it != items_.end(); diff --git a/ash/system/tray/system_tray_bubble.h b/ash/system/tray/system_tray_bubble.h index 7232805..61b1543 100644 --- a/ash/system/tray/system_tray_bubble.h +++ b/ash/system/tray/system_tray_bubble.h @@ -43,9 +43,6 @@ class SystemTrayBubble { user::LoginStatus login_status, views::TrayBubbleView::InitParams* init_params); - // Focus the default item. - void FocusDefault(); - BubbleType bubble_type() const { return bubble_type_; } views::TrayBubbleView* bubble_view() const { return bubble_view_; } |