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

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 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>
11 11
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
51 public: 51 public:
52 LocationBarViewMac(AutocompleteTextField* field, 52 LocationBarViewMac(AutocompleteTextField* field,
53 CommandUpdater* command_updater, 53 CommandUpdater* command_updater,
54 ToolbarModel* toolbar_model, 54 ToolbarModel* toolbar_model,
55 Profile* profile, 55 Profile* profile,
56 Browser* browser); 56 Browser* browser);
57 virtual ~LocationBarViewMac(); 57 virtual ~LocationBarViewMac();
58 58
59 // Overridden from LocationBar: 59 // Overridden from LocationBar:
60 virtual void ShowFirstRunBubble() OVERRIDE; 60 virtual void ShowFirstRunBubble() OVERRIDE;
61 virtual void SetInstantSuggestion(
62 const InstantSuggestion& suggestion) OVERRIDE;
63 virtual string16 GetInputString() const OVERRIDE; 61 virtual string16 GetInputString() const OVERRIDE;
64 virtual WindowOpenDisposition GetWindowOpenDisposition() const OVERRIDE; 62 virtual WindowOpenDisposition GetWindowOpenDisposition() const OVERRIDE;
65 virtual content::PageTransition GetPageTransition() const OVERRIDE; 63 virtual content::PageTransition GetPageTransition() const OVERRIDE;
66 virtual void AcceptInput() OVERRIDE; 64 virtual void AcceptInput() OVERRIDE;
67 virtual void FocusLocation(bool select_all) OVERRIDE; 65 virtual void FocusLocation(bool select_all) OVERRIDE;
68 virtual void FocusSearch() OVERRIDE; 66 virtual void FocusSearch() OVERRIDE;
69 virtual void UpdateContentSettingsIcons() OVERRIDE; 67 virtual void UpdateContentSettingsIcons() OVERRIDE;
70 virtual void UpdatePageActions() OVERRIDE; 68 virtual void UpdatePageActions() OVERRIDE;
71 virtual void InvalidatePageActions() OVERRIDE; 69 virtual void InvalidatePageActions() OVERRIDE;
72 virtual void UpdateOpenPDFInReaderPrompt() OVERRIDE; 70 virtual void UpdateOpenPDFInReaderPrompt() OVERRIDE;
(...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after
166 virtual void OnSetFocus() OVERRIDE; 164 virtual void OnSetFocus() OVERRIDE;
167 virtual gfx::Image GetFavicon() const OVERRIDE; 165 virtual gfx::Image GetFavicon() const OVERRIDE;
168 virtual string16 GetTitle() const OVERRIDE; 166 virtual string16 GetTitle() const OVERRIDE;
169 virtual InstantController* GetInstant() OVERRIDE; 167 virtual InstantController* GetInstant() OVERRIDE;
170 virtual content::WebContents* GetWebContents() const OVERRIDE; 168 virtual content::WebContents* GetWebContents() const OVERRIDE;
171 169
172 NSImage* GetKeywordImage(const string16& keyword); 170 NSImage* GetKeywordImage(const string16& keyword);
173 171
174 AutocompleteTextField* GetAutocompleteTextField() { return field_; } 172 AutocompleteTextField* GetAutocompleteTextField() { return field_; }
175 173
176
177 // content::NotificationObserver: 174 // content::NotificationObserver:
178 virtual void Observe(int type, 175 virtual void Observe(int type,
179 const content::NotificationSource& source, 176 const content::NotificationSource& source,
180 const content::NotificationDetails& details) OVERRIDE; 177 const content::NotificationDetails& details) OVERRIDE;
181 178
182 Browser* browser() const { return browser_; } 179 Browser* browser() const { return browser_; }
183 ToolbarModel* toolbar_model() const { return toolbar_model_; } 180 ToolbarModel* toolbar_model() const { return toolbar_model_; }
184 181
185 private: 182 private:
186 friend LocationBarViewMacBrowserTest; 183 friend LocationBarViewMacBrowserTest;
(...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after
289 // Used to schedule a task for the first run info bubble. 286 // Used to schedule a task for the first run info bubble.
290 base::WeakPtrFactory<LocationBarViewMac> weak_ptr_factory_; 287 base::WeakPtrFactory<LocationBarViewMac> weak_ptr_factory_;
291 288
292 // Used to change the visibility of the star decoration. 289 // Used to change the visibility of the star decoration.
293 BooleanPrefMember edit_bookmarks_enabled_; 290 BooleanPrefMember edit_bookmarks_enabled_;
294 291
295 DISALLOW_COPY_AND_ASSIGN(LocationBarViewMac); 292 DISALLOW_COPY_AND_ASSIGN(LocationBarViewMac);
296 }; 293 };
297 294
298 #endif // CHROME_BROWSER_UI_COCOA_LOCATION_BAR_LOCATION_BAR_VIEW_MAC_H_ 295 #endif // CHROME_BROWSER_UI_COCOA_LOCATION_BAR_LOCATION_BAR_VIEW_MAC_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698