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

Side by Side Diff: ash/system/tray/tray_background_view.h

Issue 177123016: Add a11y virtual keyboard icon when a11y VK is enabled (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 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 (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 ASH_SYSTEM_TRAY_TRAY_BACKGROUND_VIEW_H_ 5 #ifndef ASH_SYSTEM_TRAY_TRAY_BACKGROUND_VIEW_H_
6 #define ASH_SYSTEM_TRAY_TRAY_BACKGROUND_VIEW_H_ 6 #define ASH_SYSTEM_TRAY_TRAY_BACKGROUND_VIEW_H_
7 7
8 #include "ash/ash_export.h" 8 #include "ash/ash_export.h"
9 #include "ash/shelf/background_animator.h" 9 #include "ash/shelf/background_animator.h"
10 #include "ash/shelf/shelf_types.h" 10 #include "ash/shelf/shelf_types.h"
(...skipping 20 matching lines...) Expand all
31 31
32 // Base class for tray containers. Sets the border and layout. The container 32 // Base class for tray containers. Sets the border and layout. The container
33 // auto-resizes the widget when necessary. 33 // auto-resizes the widget when necessary.
34 class TrayContainer : public views::View { 34 class TrayContainer : public views::View {
35 public: 35 public:
36 explicit TrayContainer(ShelfAlignment alignment); 36 explicit TrayContainer(ShelfAlignment alignment);
37 virtual ~TrayContainer() {} 37 virtual ~TrayContainer() {}
38 38
39 void SetAlignment(ShelfAlignment alignment); 39 void SetAlignment(ShelfAlignment alignment);
40 40
41 void set_size(const gfx::Size& size) { size_ = size; }
kevers 2014/03/03 16:58:45 Is this change intentional? If this is dead code,
bshe 2014/03/03 20:24:03 Done.
42
43 // Overridden from views::View. 41 // Overridden from views::View.
44 virtual gfx::Size GetPreferredSize() OVERRIDE; 42 virtual gfx::Size GetPreferredSize() OVERRIDE;
45 43
46 protected: 44 protected:
47 // Overridden from views::View. 45 // Overridden from views::View.
48 virtual void ChildPreferredSizeChanged(views::View* child) OVERRIDE; 46 virtual void ChildPreferredSizeChanged(views::View* child) OVERRIDE;
49 virtual void ChildVisibilityChanged(View* child) OVERRIDE; 47 virtual void ChildVisibilityChanged(View* child) OVERRIDE;
50 virtual void ViewHierarchyChanged( 48 virtual void ViewHierarchyChanged(
51 const ViewHierarchyChangedDetails& details) OVERRIDE; 49 const ViewHierarchyChangedDetails& details) OVERRIDE;
52 50
(...skipping 127 matching lines...) Expand 10 before | Expand all | Expand 10 after
180 scoped_ptr<TrayWidgetObserver> widget_observer_; 178 scoped_ptr<TrayWidgetObserver> widget_observer_;
181 scoped_ptr<TrayEventFilter> tray_event_filter_; 179 scoped_ptr<TrayEventFilter> tray_event_filter_;
182 180
183 DISALLOW_COPY_AND_ASSIGN(TrayBackgroundView); 181 DISALLOW_COPY_AND_ASSIGN(TrayBackgroundView);
184 }; 182 };
185 183
186 } // namespace internal 184 } // namespace internal
187 } // namespace ash 185 } // namespace ash
188 186
189 #endif // ASH_SYSTEM_TRAY_TRAY_BACKGROUND_VIEW_H_ 187 #endif // ASH_SYSTEM_TRAY_TRAY_BACKGROUND_VIEW_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698