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

Side by Side Diff: chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h

Issue 12386019: Instant: Use only one hidden WebContents per profile. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 9 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_COCOA_LOCATION_BAR_LOCATION_BAR_VIEW_MAC_H_ 5 #ifndef CHROME_BROWSER_UI_COCOA_LOCATION_BAR_LOCATION_BAR_VIEW_MAC_H_
6 #define CHROME_BROWSER_UI_COCOA_LOCATION_BAR_LOCATION_BAR_VIEW_MAC_H_ 6 #define CHROME_BROWSER_UI_COCOA_LOCATION_BAR_LOCATION_BAR_VIEW_MAC_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #import <Cocoa/Cocoa.h> 10 #import <Cocoa/Cocoa.h>
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
50 public: 50 public:
51 LocationBarViewMac(AutocompleteTextField* field, 51 LocationBarViewMac(AutocompleteTextField* field,
52 CommandUpdater* command_updater, 52 CommandUpdater* command_updater,
53 ToolbarModel* toolbar_model, 53 ToolbarModel* toolbar_model,
54 Profile* profile, 54 Profile* profile,
55 Browser* browser); 55 Browser* browser);
56 virtual ~LocationBarViewMac(); 56 virtual ~LocationBarViewMac();
57 57
58 // Overridden from LocationBar: 58 // Overridden from LocationBar:
59 virtual void ShowFirstRunBubble() OVERRIDE; 59 virtual void ShowFirstRunBubble() OVERRIDE;
60 virtual void SetInstantSuggestion(
61 const InstantSuggestion& suggestion) OVERRIDE;
62 virtual string16 GetInputString() const OVERRIDE; 60 virtual string16 GetInputString() const OVERRIDE;
63 virtual WindowOpenDisposition GetWindowOpenDisposition() const OVERRIDE; 61 virtual WindowOpenDisposition GetWindowOpenDisposition() const OVERRIDE;
64 virtual content::PageTransition GetPageTransition() const OVERRIDE; 62 virtual content::PageTransition GetPageTransition() const OVERRIDE;
65 virtual void AcceptInput() OVERRIDE; 63 virtual void AcceptInput() OVERRIDE;
66 virtual void FocusLocation(bool select_all) OVERRIDE; 64 virtual void FocusLocation(bool select_all) OVERRIDE;
67 virtual void FocusSearch() OVERRIDE; 65 virtual void FocusSearch() OVERRIDE;
68 virtual void UpdateContentSettingsIcons() OVERRIDE; 66 virtual void UpdateContentSettingsIcons() OVERRIDE;
69 virtual void UpdatePageActions() OVERRIDE; 67 virtual void UpdatePageActions() OVERRIDE;
70 virtual void InvalidatePageActions() OVERRIDE; 68 virtual void InvalidatePageActions() OVERRIDE;
71 virtual void UpdateOpenPDFInReaderPrompt() OVERRIDE; 69 virtual void UpdateOpenPDFInReaderPrompt() OVERRIDE;
(...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after
165 virtual void OnSetFocus() OVERRIDE; 163 virtual void OnSetFocus() OVERRIDE;
166 virtual gfx::Image GetFavicon() const OVERRIDE; 164 virtual gfx::Image GetFavicon() const OVERRIDE;
167 virtual string16 GetTitle() const OVERRIDE; 165 virtual string16 GetTitle() const OVERRIDE;
168 virtual InstantController* GetInstant() OVERRIDE; 166 virtual InstantController* GetInstant() OVERRIDE;
169 virtual content::WebContents* GetWebContents() const OVERRIDE; 167 virtual content::WebContents* GetWebContents() const OVERRIDE;
170 168
171 NSImage* GetKeywordImage(const string16& keyword); 169 NSImage* GetKeywordImage(const string16& keyword);
172 170
173 AutocompleteTextField* GetAutocompleteTextField() { return field_; } 171 AutocompleteTextField* GetAutocompleteTextField() { return field_; }
174 172
175
176 // content::NotificationObserver: 173 // content::NotificationObserver:
177 virtual void Observe(int type, 174 virtual void Observe(int type,
178 const content::NotificationSource& source, 175 const content::NotificationSource& source,
179 const content::NotificationDetails& details) OVERRIDE; 176 const content::NotificationDetails& details) OVERRIDE;
180 177
181 Browser* browser() const { return browser_; } 178 Browser* browser() const { return browser_; }
182 179
183 private: 180 private:
184 friend LocationBarViewMacBrowserTest; 181 friend LocationBarViewMacBrowserTest;
185 182
(...skipping 100 matching lines...) Expand 10 before | Expand all | Expand 10 after
286 // Used to schedule a task for the first run info bubble. 283 // Used to schedule a task for the first run info bubble.
287 base::WeakPtrFactory<LocationBarViewMac> weak_ptr_factory_; 284 base::WeakPtrFactory<LocationBarViewMac> weak_ptr_factory_;
288 285
289 // Used to change the visibility of the star decoration. 286 // Used to change the visibility of the star decoration.
290 BooleanPrefMember edit_bookmarks_enabled_; 287 BooleanPrefMember edit_bookmarks_enabled_;
291 288
292 DISALLOW_COPY_AND_ASSIGN(LocationBarViewMac); 289 DISALLOW_COPY_AND_ASSIGN(LocationBarViewMac);
293 }; 290 };
294 291
295 #endif // CHROME_BROWSER_UI_COCOA_LOCATION_BAR_LOCATION_BAR_VIEW_MAC_H_ 292 #endif // CHROME_BROWSER_UI_COCOA_LOCATION_BAR_LOCATION_BAR_VIEW_MAC_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698