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

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

Issue 10825254: Remove views::KeyEvent, replacing uses of it with ui::KeyEvent. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: 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_CONTAINER_H_ 5 #ifndef CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_LOCATION_BAR_CONTAINER_H_
6 #define CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_LOCATION_BAR_CONTAINER_H_ 6 #define CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_LOCATION_BAR_CONTAINER_H_
7 7
8 #include "third_party/skia/include/core/SkColor.h" 8 #include "third_party/skia/include/core/SkColor.h"
9 #include "ui/views/view.h" 9 #include "ui/views/view.h"
10 #include "ui/views/animation/bounds_animator.h" 10 #include "ui/views/animation/bounds_animator.h"
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
46 bool IsAnimating() const; 46 bool IsAnimating() const;
47 47
48 // Returns the target bounds if animating, or the actual bounds if not 48 // Returns the target bounds if animating, or the actual bounds if not
49 // animating. 49 // animating.
50 gfx::Rect GetTargetBounds(); 50 gfx::Rect GetTargetBounds();
51 51
52 // views::View overrides: 52 // views::View overrides:
53 virtual std::string GetClassName() const OVERRIDE; 53 virtual std::string GetClassName() const OVERRIDE;
54 virtual gfx::Size GetPreferredSize() OVERRIDE; 54 virtual gfx::Size GetPreferredSize() OVERRIDE;
55 virtual bool SkipDefaultKeyEventProcessing( 55 virtual bool SkipDefaultKeyEventProcessing(
56 const views::KeyEvent& event) OVERRIDE; 56 const ui::KeyEvent& event) OVERRIDE;
57 virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE; 57 virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE;
58 58
59 // views::BoundsAnimatorObserver overrides: 59 // views::BoundsAnimatorObserver overrides:
60 virtual void OnBoundsAnimatorProgressed( 60 virtual void OnBoundsAnimatorProgressed(
61 views::BoundsAnimator* animator) OVERRIDE {} 61 views::BoundsAnimator* animator) OVERRIDE {}
62 virtual void OnBoundsAnimatorDone(views::BoundsAnimator* animator) OVERRIDE; 62 virtual void OnBoundsAnimatorDone(views::BoundsAnimator* animator) OVERRIDE;
63 63
64 protected: 64 protected:
65 virtual void OnFocus() OVERRIDE; 65 virtual void OnFocus() OVERRIDE;
66 66
(...skipping 16 matching lines...) Expand all
83 LocationBarView* location_bar_view_; 83 LocationBarView* location_bar_view_;
84 84
85 views::NativeViewHost* native_view_host_; 85 views::NativeViewHost* native_view_host_;
86 86
87 bool in_toolbar_; 87 bool in_toolbar_;
88 88
89 DISALLOW_COPY_AND_ASSIGN(LocationBarContainer); 89 DISALLOW_COPY_AND_ASSIGN(LocationBarContainer);
90 }; 90 };
91 91
92 #endif // CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_LOCATION_BAR_CONTAINER_H_ 92 #endif // CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_LOCATION_BAR_CONTAINER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698