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

Side by Side Diff: chrome/browser/ui/views/location_bar/location_bar_view.h

Issue 10796116: [Web Intents] Basic location bar UI for window disposition picker affordance. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge to head Created 8 years, 4 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_VIEWS_LOCATION_BAR_LOCATION_BAR_VIEW_H_ 5 #ifndef CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_LOCATION_BAR_VIEW_H_
6 #define CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_LOCATION_BAR_VIEW_H_ 6 #define CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_LOCATION_BAR_VIEW_H_
7 7
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 302 matching lines...) Expand 10 before | Expand all | Expand 10 after
313 InstantCompleteBehavior behavior) OVERRIDE; 313 InstantCompleteBehavior behavior) OVERRIDE;
314 virtual string16 GetInputString() const OVERRIDE; 314 virtual string16 GetInputString() const OVERRIDE;
315 virtual WindowOpenDisposition GetWindowOpenDisposition() const OVERRIDE; 315 virtual WindowOpenDisposition GetWindowOpenDisposition() const OVERRIDE;
316 virtual content::PageTransition GetPageTransition() const OVERRIDE; 316 virtual content::PageTransition GetPageTransition() const OVERRIDE;
317 virtual void AcceptInput() OVERRIDE; 317 virtual void AcceptInput() OVERRIDE;
318 virtual void FocusLocation(bool select_all) OVERRIDE; 318 virtual void FocusLocation(bool select_all) OVERRIDE;
319 virtual void FocusSearch() OVERRIDE; 319 virtual void FocusSearch() OVERRIDE;
320 virtual void UpdateContentSettingsIcons() OVERRIDE; 320 virtual void UpdateContentSettingsIcons() OVERRIDE;
321 virtual void UpdatePageActions() OVERRIDE; 321 virtual void UpdatePageActions() OVERRIDE;
322 virtual void InvalidatePageActions() OVERRIDE; 322 virtual void InvalidatePageActions() OVERRIDE;
323 virtual void UpdateWebIntentsButton() OVERRIDE;
323 virtual void SaveStateToContents(content::WebContents* contents) OVERRIDE; 324 virtual void SaveStateToContents(content::WebContents* contents) OVERRIDE;
324 virtual void Revert() OVERRIDE; 325 virtual void Revert() OVERRIDE;
325 virtual const OmniboxView* GetLocationEntry() const OVERRIDE; 326 virtual const OmniboxView* GetLocationEntry() const OVERRIDE;
326 virtual OmniboxView* GetLocationEntry() OVERRIDE; 327 virtual OmniboxView* GetLocationEntry() OVERRIDE;
327 virtual LocationBarTesting* GetLocationBarForTesting() OVERRIDE; 328 virtual LocationBarTesting* GetLocationBarForTesting() OVERRIDE;
328 329
329 // Overridden from LocationBarTesting: 330 // Overridden from LocationBarTesting:
330 virtual int PageActionCount() OVERRIDE; 331 virtual int PageActionCount() OVERRIDE;
331 virtual int PageActionVisibleCount() OVERRIDE; 332 virtual int PageActionVisibleCount() OVERRIDE;
332 virtual ExtensionAction* GetPageAction(size_t index) OVERRIDE; 333 virtual ExtensionAction* GetPageAction(size_t index) OVERRIDE;
(...skipping 228 matching lines...) Expand 10 before | Expand all | Expand 10 after
561 562
562 #if defined(USE_AURA) 563 #if defined(USE_AURA)
563 // Observer for a fade-in animation. 564 // Observer for a fade-in animation.
564 scoped_ptr<FadeAnimationObserver> fade_animation_observer_; 565 scoped_ptr<FadeAnimationObserver> fade_animation_observer_;
565 #endif 566 #endif
566 567
567 DISALLOW_IMPLICIT_CONSTRUCTORS(LocationBarView); 568 DISALLOW_IMPLICIT_CONSTRUCTORS(LocationBarView);
568 }; 569 };
569 570
570 #endif // CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_LOCATION_BAR_VIEW_H_ 571 #endif // CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_LOCATION_BAR_VIEW_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698