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

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

Issue 10915217: Hook up SetInstantPreviewHeight for ChromeOS. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: More comments. Created 8 years, 3 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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 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 "base/basictypes.h" 8 #include "base/basictypes.h"
9 #include "base/compiler_specific.h" 9 #include "base/compiler_specific.h"
10 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
50 50
51 private: 51 private:
52 // Overridden from InstantControllerDelegate: 52 // Overridden from InstantControllerDelegate:
53 virtual void ShowInstant() OVERRIDE; 53 virtual void ShowInstant() OVERRIDE;
54 virtual void HideInstant() OVERRIDE; 54 virtual void HideInstant() OVERRIDE;
55 virtual void CommitInstant(TabContents* preview) OVERRIDE; 55 virtual void CommitInstant(TabContents* preview) OVERRIDE;
56 virtual void SetSuggestedText(const string16& text, 56 virtual void SetSuggestedText(const string16& text,
57 InstantCompleteBehavior behavior) OVERRIDE; 57 InstantCompleteBehavior behavior) OVERRIDE;
58 virtual gfx::Rect GetInstantBounds() OVERRIDE; 58 virtual gfx::Rect GetInstantBounds() OVERRIDE;
59 virtual void InstantPreviewFocused() OVERRIDE; 59 virtual void InstantPreviewFocused() OVERRIDE;
60 virtual void SetInstantPreviewHeight(int height,
61 InstantSizeUnits units) OVERRIDE;
60 virtual TabContents* GetActiveTabContents() const OVERRIDE; 62 virtual TabContents* GetActiveTabContents() const OVERRIDE;
61 63
62 // Overridden from content::NotificationObserver: 64 // Overridden from content::NotificationObserver:
63 virtual void Observe(int type, 65 virtual void Observe(int type,
64 const content::NotificationSource& source, 66 const content::NotificationSource& source,
65 const content::NotificationDetails& details) OVERRIDE; 67 const content::NotificationDetails& details) OVERRIDE;
66 68
67 // Overridden from TabStripModelObserver: 69 // Overridden from TabStripModelObserver:
68 virtual void TabDeactivated(TabContents* contents) OVERRIDE; 70 virtual void TabDeactivated(TabContents* contents) OVERRIDE;
69 71
70 // If this browser should have Instant, a new InstantController created; 72 // If this browser should have Instant, a new InstantController created;
71 // otherwise any existing InstantController is destroyed. 73 // otherwise any existing InstantController is destroyed.
72 void ResetInstant(); 74 void ResetInstant();
73 75
74 Browser* browser_; 76 Browser* browser_;
75 77
76 scoped_ptr<InstantController> instant_; 78 scoped_ptr<InstantController> instant_;
77 scoped_ptr<InstantUnloadHandler> instant_unload_handler_; 79 scoped_ptr<InstantUnloadHandler> instant_unload_handler_;
78 80
79 PrefChangeRegistrar profile_pref_registrar_; 81 PrefChangeRegistrar profile_pref_registrar_;
80 82
81 DISALLOW_COPY_AND_ASSIGN(BrowserInstantController); 83 DISALLOW_COPY_AND_ASSIGN(BrowserInstantController);
82 }; 84 };
83 85
84 } // namespace chrome 86 } // namespace chrome
85 87
86 #endif // CHROME_BROWSER_UI_BROWSER_INSTANT_CONTROLLER_H_ 88 #endif // CHROME_BROWSER_UI_BROWSER_INSTANT_CONTROLLER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698