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

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

Issue 8508055: Move views::Accelerator to ui in order to use it from aura code. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Rebase Created 9 years, 1 month 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
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 #pragma once 7 #pragma once
8 8
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
42 class InstantController; 42 class InstantController;
43 class KeywordHintView; 43 class KeywordHintView;
44 class LocationIconView; 44 class LocationIconView;
45 class PageActionWithBadgeView; 45 class PageActionWithBadgeView;
46 class SelectedKeywordView; 46 class SelectedKeywordView;
47 class StarView; 47 class StarView;
48 class TabContents; 48 class TabContents;
49 class TabContentsWrapper; 49 class TabContentsWrapper;
50 class TemplateURLService; 50 class TemplateURLService;
51 51
52 namespace ui {
53 class Accelerator;
54 } // namespace ui
52 namespace views { 55 namespace views {
53 class Accelerator;
54 class HorizontalPainter; 56 class HorizontalPainter;
55 class Label; 57 class Label;
56 } // namespace views 58 } // namespace views
57 59
58 #if defined(OS_WIN) || defined(USE_AURA) 60 #if defined(OS_WIN) || defined(USE_AURA)
59 class SuggestedTextView; 61 class SuggestedTextView;
60 #endif 62 #endif
61 63
62 ///////////////////////////////////////////////////////////////////////////// 64 /////////////////////////////////////////////////////////////////////////////
63 // 65 //
(...skipping 364 matching lines...) Expand 10 before | Expand all | Expand 10 after
428 // While animating, the host clips the widget and draws only the bottom 430 // While animating, the host clips the widget and draws only the bottom
429 // part of it. The view needs to know the pixel offset at which we are drawing 431 // part of it. The view needs to know the pixel offset at which we are drawing
430 // the widget so that we can draw the curved edges that attach to the toolbar 432 // the widget so that we can draw the curved edges that attach to the toolbar
431 // in the right location. 433 // in the right location.
432 int animation_offset_; 434 int animation_offset_;
433 435
434 DISALLOW_IMPLICIT_CONSTRUCTORS(LocationBarView); 436 DISALLOW_IMPLICIT_CONSTRUCTORS(LocationBarView);
435 }; 437 };
436 438
437 #endif // CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_LOCATION_BAR_VIEW_H_ 439 #endif // CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_LOCATION_BAR_VIEW_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698