summaryrefslogtreecommitdiffstats
path: root/chrome/browser/ui/browser_instant_controller.cc
diff options
context:
space:
mode:
authorsamarth@chromium.org <samarth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-12-05 04:42:12 +0000
committersamarth@chromium.org <samarth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-12-05 04:42:12 +0000
commitc18cb67d0d9e18b15dd5a8903e93d91c6c63a484 (patch)
treef159e15f4412b7640155e00436c4943ea07511cb /chrome/browser/ui/browser_instant_controller.cc
parenta06b5b63d01fd6b84a3edc4b422af2d533261347 (diff)
downloadchromium_src-c18cb67d0d9e18b15dd5a8903e93d91c6c63a484.zip
chromium_src-c18cb67d0d9e18b15dd5a8903e93d91c6c63a484.tar.gz
chromium_src-c18cb67d0d9e18b15dd5a8903e93d91c6c63a484.tar.bz2
Implement {Start,Stop}CapturingKeyStrokes for Instant.
Implement {Start,Stop}CapturingKeyStrokes for Instant by transferring focus invisibly to the omnibox. This patch implements invisible focus for Aura. Other platforms will follow. BUG= Review URL: https://chromiumcodereview.appspot.com/11369137 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@171160 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/browser_instant_controller.cc')
-rw-r--r--chrome/browser/ui/browser_instant_controller.cc11
1 files changed, 9 insertions, 2 deletions
diff --git a/chrome/browser/ui/browser_instant_controller.cc b/chrome/browser/ui/browser_instant_controller.cc
index b9ae096..9b82049 100644
--- a/chrome/browser/ui/browser_instant_controller.cc
+++ b/chrome/browser/ui/browser_instant_controller.cc
@@ -12,6 +12,7 @@
#include "chrome/browser/ui/browser.h"
#include "chrome/browser/ui/browser_window.h"
#include "chrome/browser/ui/omnibox/location_bar.h"
+#include "chrome/browser/ui/omnibox/omnibox_view.h"
#include "chrome/browser/ui/search/search.h"
#include "chrome/browser/ui/search/search_tab_helper.h"
#include "chrome/browser/ui/tab_contents/tab_contents.h"
@@ -112,8 +113,7 @@ void BrowserInstantController::CommitInstant(content::WebContents* preview,
void BrowserInstantController::SetInstantSuggestion(
const InstantSuggestion& suggestion) {
- if (browser_->window()->GetLocationBar())
- browser_->window()->GetLocationBar()->SetInstantSuggestion(suggestion);
+ browser_->window()->GetLocationBar()->SetInstantSuggestion(suggestion);
}
gfx::Rect BrowserInstantController::GetInstantBounds() {
@@ -125,6 +125,13 @@ void BrowserInstantController::InstantPreviewFocused() {
browser_->window()->WebContentsFocused(instant_.GetPreviewContents());
}
+void BrowserInstantController::FocusOmniboxInvisibly() {
+ OmniboxView* omnibox_view = browser_->window()->GetLocationBar()->
+ GetLocationEntry();
+ omnibox_view->SetFocus();
+ omnibox_view->model()->SetCaretVisibility(false);
+}
+
content::WebContents* BrowserInstantController::GetActiveWebContents() const {
return browser_->tab_strip_model()->GetActiveWebContents();
}