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

Side by Side Diff: ash/shelf/shelf_widget.cc

Issue 12813004: Chromium style checker cleanup (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased Created 7 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
« no previous file with comments | « no previous file | cc/layer_tree_host_unittest_delegated.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 #include "ash/shelf/shelf_widget.h" 5 #include "ash/shelf/shelf_widget.h"
6 6
7 #include "ash/focus_cycler.h" 7 #include "ash/focus_cycler.h"
8 #include "ash/launcher/launcher_delegate.h" 8 #include "ash/launcher/launcher_delegate.h"
9 #include "ash/launcher/launcher_model.h" 9 #include "ash/launcher/launcher_model.h"
10 #include "ash/launcher/launcher_navigator.h" 10 #include "ash/launcher/launcher_navigator.h"
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
62 // Set if the shelf area is dimmed (eg when a window is maximized). 62 // Set if the shelf area is dimmed (eg when a window is maximized).
63 void SetDimmed(bool dimmed) { 63 void SetDimmed(bool dimmed) {
64 if (dimmed_ != dimmed) { 64 if (dimmed_ != dimmed) {
65 dimmed_ = dimmed; 65 dimmed_ = dimmed;
66 SchedulePaint(); 66 SchedulePaint();
67 } 67 }
68 } 68 }
69 bool GetDimmed() const { return dimmed_; } 69 bool GetDimmed() const { return dimmed_; }
70 70
71 // views::View overrides: 71 // views::View overrides:
72 void OnPaintBackground(gfx::Canvas* canvas) OVERRIDE; 72 virtual void OnPaintBackground(gfx::Canvas* canvas) OVERRIDE;
73 73
74 // views::WidgetDelegateView overrides: 74 // views::WidgetDelegateView overrides:
75 views::Widget* GetWidget() OVERRIDE { 75 virtual views::Widget* GetWidget() OVERRIDE {
76 return View::GetWidget(); 76 return View::GetWidget();
77 } 77 }
78 const views::Widget* GetWidget() const OVERRIDE { 78 virtual const views::Widget* GetWidget() const OVERRIDE {
79 return View::GetWidget(); 79 return View::GetWidget();
80 } 80 }
81 81
82 bool CanActivate() const OVERRIDE; 82 virtual bool CanActivate() const OVERRIDE;
83 void Layout() OVERRIDE; 83 virtual void Layout() OVERRIDE;
84 84
85 // BackgroundAnimatorDelegate overrides: 85 // BackgroundAnimatorDelegate overrides:
86 void UpdateBackground(int alpha) OVERRIDE; 86 virtual void UpdateBackground(int alpha) OVERRIDE;
87 87
88 private: 88 private:
89 ShelfWidget* shelf_; 89 ShelfWidget* shelf_;
90 internal::FocusCycler* focus_cycler_; 90 internal::FocusCycler* focus_cycler_;
91 int alpha_; 91 int alpha_;
92 bool dimmed_; 92 bool dimmed_;
93 93
94 DISALLOW_COPY_AND_ASSIGN(DelegateView); 94 DISALLOW_COPY_AND_ASSIGN(DelegateView);
95 }; 95 };
96 96
(...skipping 206 matching lines...) Expand 10 before | Expand all | Expand 10 after
303 } 303 }
304 304
305 void ShelfWidget::ShutdownStatusAreaWidget() { 305 void ShelfWidget::ShutdownStatusAreaWidget() {
306 if (status_area_widget_) 306 if (status_area_widget_)
307 status_area_widget_->Shutdown(); 307 status_area_widget_->Shutdown();
308 status_area_widget_ = NULL; 308 status_area_widget_ = NULL;
309 } 309 }
310 310
311 } // namespace ash 311 } // namespace ash
312 312
OLDNEW
« no previous file with comments | « no previous file | cc/layer_tree_host_unittest_delegated.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698