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

Side by Side Diff: chrome/browser/ui/views/location_bar/location_bar_view.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_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 273 matching lines...) Expand 10 before | Expand all | Expand 10 after
284 virtual void OnInputInProgress(bool in_progress) OVERRIDE; 284 virtual void OnInputInProgress(bool in_progress) OVERRIDE;
285 virtual void OnKillFocus() OVERRIDE; 285 virtual void OnKillFocus() OVERRIDE;
286 virtual void OnSetFocus() OVERRIDE; 286 virtual void OnSetFocus() OVERRIDE;
287 virtual SkBitmap GetFavicon() const OVERRIDE; 287 virtual SkBitmap GetFavicon() const OVERRIDE;
288 virtual string16 GetTitle() const OVERRIDE; 288 virtual string16 GetTitle() const OVERRIDE;
289 virtual InstantController* GetInstant() OVERRIDE; 289 virtual InstantController* GetInstant() OVERRIDE;
290 virtual TabContents* GetTabContents() const OVERRIDE; 290 virtual TabContents* GetTabContents() const OVERRIDE;
291 291
292 // Overridden from views::View: 292 // Overridden from views::View:
293 virtual std::string GetClassName() const OVERRIDE; 293 virtual std::string GetClassName() const OVERRIDE;
294 virtual bool SkipDefaultKeyEventProcessing(const views::KeyEvent& event) 294 virtual bool SkipDefaultKeyEventProcessing(
295 OVERRIDE; 295 const ui::KeyEvent& event) OVERRIDE;
296 virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE; 296 virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE;
297 virtual bool HasFocus() const OVERRIDE; 297 virtual bool HasFocus() const OVERRIDE;
298 298
299 // Overridden from views::DragController: 299 // Overridden from views::DragController:
300 virtual void WriteDragDataForView(View* sender, 300 virtual void WriteDragDataForView(View* sender,
301 const gfx::Point& press_pt, 301 const gfx::Point& press_pt,
302 OSExchangeData* data) OVERRIDE; 302 OSExchangeData* data) OVERRIDE;
303 virtual int GetDragOperationsForView(View* sender, 303 virtual int GetDragOperationsForView(View* sender,
304 const gfx::Point& p) OVERRIDE; 304 const gfx::Point& p) OVERRIDE;
305 virtual bool CanStartDragForView(View* sender, 305 virtual bool CanStartDragForView(View* sender,
(...skipping 249 matching lines...) Expand 10 before | Expand all | Expand 10 after
555 555
556 #if defined(USE_AURA) 556 #if defined(USE_AURA)
557 // Observer for a fade-in animation. 557 // Observer for a fade-in animation.
558 scoped_ptr<FadeAnimationObserver> fade_animation_observer_; 558 scoped_ptr<FadeAnimationObserver> fade_animation_observer_;
559 #endif 559 #endif
560 560
561 DISALLOW_IMPLICIT_CONSTRUCTORS(LocationBarView); 561 DISALLOW_IMPLICIT_CONSTRUCTORS(LocationBarView);
562 }; 562 };
563 563
564 #endif // CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_LOCATION_BAR_VIEW_H_ 564 #endif // CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_LOCATION_BAR_VIEW_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698