summaryrefslogtreecommitdiffstats
path: root/chrome/browser/ui
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser/ui')
-rw-r--r--chrome/browser/ui/browser_instant_controller.cc4
-rw-r--r--chrome/browser/ui/browser_instant_controller.h5
2 files changed, 5 insertions, 4 deletions
diff --git a/chrome/browser/ui/browser_instant_controller.cc b/chrome/browser/ui/browser_instant_controller.cc
index 0a32bba..1cf312c 100644
--- a/chrome/browser/ui/browser_instant_controller.cc
+++ b/chrome/browser/ui/browser_instant_controller.cc
@@ -178,11 +178,11 @@ void BrowserInstantController::InstantOverlayFocused() {
browser_->window()->WebContentsFocused(instant_.GetOverlayContents());
}
-void BrowserInstantController::FocusOmniboxInvisibly() {
+void BrowserInstantController::FocusOmnibox(bool caret_visibility) {
OmniboxView* omnibox_view = browser_->window()->GetLocationBar()->
GetLocationEntry();
omnibox_view->SetFocus();
- omnibox_view->model()->SetCaretVisibility(false);
+ omnibox_view->model()->SetCaretVisibility(caret_visibility);
}
content::WebContents* BrowserInstantController::GetActiveWebContents() const {
diff --git a/chrome/browser/ui/browser_instant_controller.h b/chrome/browser/ui/browser_instant_controller.h
index e5d6836..21cc6d8 100644
--- a/chrome/browser/ui/browser_instant_controller.h
+++ b/chrome/browser/ui/browser_instant_controller.h
@@ -80,8 +80,9 @@ class BrowserInstantController : public content::NotificationObserver,
// to the user clicking on it.
void InstantOverlayFocused();
- // Invoked by |instant_| to give the omnibox focus invisibly.
- void FocusOmniboxInvisibly();
+ // Invoked by |instant_| to give the omnibox focus, with the option of making
+ // the caret invisible.
+ void FocusOmnibox(bool caret_visibility);
// Invoked by |instant_| to get the currently active tab, over which the
// overlay would be shown.