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

Side by Side Diff: chrome/browser/ui/browser_instant_controller.h

Issue 18223002: InstantExtended: Remove overlay control code. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase. Created 7 years, 5 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright 2012 The Chromium Authors. All rights reserved. 1 // Copyright 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CHROME_BROWSER_UI_BROWSER_INSTANT_CONTROLLER_H_ 5 #ifndef CHROME_BROWSER_UI_BROWSER_INSTANT_CONTROLLER_H_
6 #define CHROME_BROWSER_UI_BROWSER_INSTANT_CONTROLLER_H_ 6 #define CHROME_BROWSER_UI_BROWSER_INSTANT_CONTROLLER_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
48 // for use from OpenCurrentURL. 48 // for use from OpenCurrentURL.
49 bool OpenInstant(WindowOpenDisposition disposition, const GURL& url); 49 bool OpenInstant(WindowOpenDisposition disposition, const GURL& url);
50 50
51 // Returns the Profile associated with the Browser that owns this object. 51 // Returns the Profile associated with the Browser that owns this object.
52 Profile* profile() const; 52 Profile* profile() const;
53 53
54 // Returns the InstantController or NULL if there is no InstantController for 54 // Returns the InstantController or NULL if there is no InstantController for
55 // this BrowserInstantController. 55 // this BrowserInstantController.
56 InstantController* instant() { return &instant_; } 56 InstantController* instant() { return &instant_; }
57 57
58 // Invoked by |instant_| to commit the |overlay| by merging it into the active
59 // tab or adding it as a new tab.
60 void CommitInstant(scoped_ptr<content::WebContents> overlay, bool in_new_tab);
61
62 // Invoked by |instant_| to autocomplete the |suggestion| into the omnibox.
63 void SetInstantSuggestion(const InstantSuggestion& suggestion);
64
65 // Invoked by |instant_| to get the bounds that the overlay is placed at,
66 // in screen coordinates.
67 gfx::Rect GetInstantBounds();
68
69 // Invoked by |instant_| to notify that the overlay gained focus, usually due
70 // to the user clicking on it.
71 void InstantOverlayFocused();
72
73 // Invoked by |instant_| to give the omnibox focus, with the option of making 58 // Invoked by |instant_| to give the omnibox focus, with the option of making
74 // the caret invisible. 59 // the caret invisible.
75 void FocusOmnibox(bool caret_visibility); 60 void FocusOmnibox(bool caret_visibility);
76 61
77 // Invoked by |instant_| to get the currently active tab, over which the 62 // Invoked by |instant_| to get the currently active tab.
78 // overlay would be shown.
79 content::WebContents* GetActiveWebContents() const; 63 content::WebContents* GetActiveWebContents() const;
80 64
81 // Invoked by |browser_| when the active tab changes. 65 // Invoked by |browser_| when the active tab changes.
82 void ActiveTabChanged(); 66 void ActiveTabChanged();
83 67
84 // Invoked by |browser_| when the active tab is about to be deactivated. 68 // Invoked by |browser_| when the active tab is about to be deactivated.
85 void TabDeactivated(content::WebContents* contents); 69 void TabDeactivated(content::WebContents* contents);
86 70
87 // Invoked by the InstantController when it wants to open a URL. 71 // Invoked by the InstantController when it wants to open a URL.
88 void OpenURL(const GURL& url, 72 void OpenURL(const GURL& url,
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
123 107
124 InstantController instant_; 108 InstantController instant_;
125 InstantUnloadHandler instant_unload_handler_; 109 InstantUnloadHandler instant_unload_handler_;
126 110
127 PrefChangeRegistrar profile_pref_registrar_; 111 PrefChangeRegistrar profile_pref_registrar_;
128 112
129 DISALLOW_COPY_AND_ASSIGN(BrowserInstantController); 113 DISALLOW_COPY_AND_ASSIGN(BrowserInstantController);
130 }; 114 };
131 115
132 #endif // CHROME_BROWSER_UI_BROWSER_INSTANT_CONTROLLER_H_ 116 #endif // CHROME_BROWSER_UI_BROWSER_INSTANT_CONTROLLER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698