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

Unified Diff: chrome/browser/ui/search/instant_controller.h

Issue 12851023: Refactor omnibox focus API into a single method. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 7 years, 8 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 | « chrome/browser/ui/omnibox/omnibox_edit_model.h ('k') | chrome/browser/ui/search/instant_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/search/instant_controller.h
diff --git a/chrome/browser/ui/search/instant_controller.h b/chrome/browser/ui/search/instant_controller.h
index 09db21d34428b842e7ad83f6c15c34ec1cdee633..2458f6019626a77a30fc4260ecb5e87c25db01ba 100644
--- a/chrome/browser/ui/search/instant_controller.h
+++ b/chrome/browser/ui/search/instant_controller.h
@@ -23,6 +23,7 @@
#include "chrome/browser/ui/search/instant_overlay_model.h"
#include "chrome/browser/ui/search/instant_page.h"
#include "chrome/common/instant_types.h"
+#include "chrome/common/omnibox_focus_state.h"
#include "chrome/common/search_types.h"
#include "content/public/browser/notification_observer.h"
#include "content/public/browser/notification_registrar.h"
@@ -245,10 +246,8 @@ class InstantController : public InstantPage::Delegate,
const content::WebContents* contents,
int height,
InstantSizeUnits units) OVERRIDE;
- virtual void FocusOmnibox(const content::WebContents* contents) OVERRIDE;
- virtual void StartCapturingKeyStrokes(
- const content::WebContents* contents) OVERRIDE;
- virtual void StopCapturingKeyStrokes(content::WebContents* contents) OVERRIDE;
+ virtual void FocusOmnibox(const content::WebContents* contents,
+ OmniboxFocusState state) OVERRIDE;
virtual void NavigateToURL(
const content::WebContents* contents,
const GURL& url,
« no previous file with comments | « chrome/browser/ui/omnibox/omnibox_edit_model.h ('k') | chrome/browser/ui/search/instant_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698