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

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

Issue 11091050: InstantExtended: Add js api for custom logo. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 2 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 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
48 48
49 // Returns the InstantController or NULL if there is no InstantController for 49 // Returns the InstantController or NULL if there is no InstantController for
50 // this BrowserInstantController. 50 // this BrowserInstantController.
51 InstantController* instant() const { return instant_.get(); } 51 InstantController* instant() const { return instant_.get(); }
52 52
53 private: 53 private:
54 // Overridden from InstantControllerDelegate: 54 // Overridden from InstantControllerDelegate:
55 virtual void ShowInstant(int height, InstantSizeUnits units) OVERRIDE; 55 virtual void ShowInstant(int height, InstantSizeUnits units) OVERRIDE;
56 virtual void HideInstant() OVERRIDE; 56 virtual void HideInstant() OVERRIDE;
57 virtual void CommitInstant(TabContents* preview, bool in_new_tab) OVERRIDE; 57 virtual void CommitInstant(TabContents* preview, bool in_new_tab) OVERRIDE;
58 virtual void SetHasCustomLogo(bool has_logo) OVERRIDE;
58 virtual void SetSuggestedText(const string16& text, 59 virtual void SetSuggestedText(const string16& text,
59 InstantCompleteBehavior behavior) OVERRIDE; 60 InstantCompleteBehavior behavior) OVERRIDE;
60 virtual gfx::Rect GetInstantBounds() OVERRIDE; 61 virtual gfx::Rect GetInstantBounds() OVERRIDE;
61 virtual void InstantPreviewFocused() OVERRIDE; 62 virtual void InstantPreviewFocused() OVERRIDE;
62 virtual TabContents* GetActiveTabContents() const OVERRIDE; 63 virtual TabContents* GetActiveTabContents() const OVERRIDE;
63 64
64 // Overridden from content::NotificationObserver: 65 // Overridden from content::NotificationObserver:
65 virtual void Observe(int type, 66 virtual void Observe(int type,
66 const content::NotificationSource& source, 67 const content::NotificationSource& source,
67 const content::NotificationDetails& details) OVERRIDE; 68 const content::NotificationDetails& details) OVERRIDE;
(...skipping 15 matching lines...) Expand all
83 InstantUnloadHandler instant_unload_handler_; 84 InstantUnloadHandler instant_unload_handler_;
84 85
85 PrefChangeRegistrar profile_pref_registrar_; 86 PrefChangeRegistrar profile_pref_registrar_;
86 87
87 DISALLOW_IMPLICIT_CONSTRUCTORS(BrowserInstantController); 88 DISALLOW_IMPLICIT_CONSTRUCTORS(BrowserInstantController);
88 }; 89 };
89 90
90 } // namespace chrome 91 } // namespace chrome
91 92
92 #endif // CHROME_BROWSER_UI_BROWSER_INSTANT_CONTROLLER_H_ 93 #endif // CHROME_BROWSER_UI_BROWSER_INSTANT_CONTROLLER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698