1 files changed, 14 insertions, 0 deletions
diff --git a/chrome/browser/chromeos/browser_extenders.cc b/chrome/browser/chromeos/browser_extenders.cc
index 0c902c3..0e21d98 100644
--- a/chrome/browser/chromeos/browser_extenders.cc
+++ b/chrome/browser/chromeos/browser_extenders.cc
@@ -170,8 +170,18 @@ class NormalExtender : public BrowserExtender,
     return compact_navigation_bar_enabled_;
   }
 
+  virtual bool SetFocusToCompactNavigationBar() {
+    if (compact_navigation_bar_->IsFocusable()) {
+      compact_navigation_bar_->FocusLocation();
+      return true;
+    } else {
+      return false;
+    }
+  }
+
   virtual void ToggleCompactNavigationBar() {
     compact_navigation_bar_enabled_ = !compact_navigation_bar_enabled_;
+    compact_navigation_bar_->SetFocusable(compact_navigation_bar_enabled_);
     status_area_->Update();
   }
 
@@ -308,6 +318,10 @@ class PopupExtender : public BrowserExtender {
     return true;
   }
 
+  virtual bool SetFocusToCompactNavigationBar() {
+    return false;
+  }
+
   virtual void ToggleCompactNavigationBar() {}
 
   virtual void OnMouseEnteredToTab(Tab* tab) {}