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

Unified Diff: ash/shell.h

Issue 2095193002: clang-format all of //ash (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 6 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/shelf/shelf_window_watcher_unittest.cc ('k') | ash/shell.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/shell.h
diff --git a/ash/shell.h b/ash/shell.h
index 943da8ad9eb6b26c70524146467280274dcb27fd..984482ff6694e885afc55d7860f9316c3b25486c 100644
--- a/ash/shell.h
+++ b/ash/shell.h
@@ -331,9 +331,7 @@ class ASH_EXPORT Shell : public SystemModalContainerEventFilterDelegate,
DisplayConfigurationController* display_configuration_controller() {
return display_configuration_controller_.get();
}
- ::wm::CompoundEventFilter* env_filter() {
- return env_filter_.get();
- }
+ ::wm::CompoundEventFilter* env_filter() { return env_filter_.get(); }
views::corewm::TooltipController* tooltip_controller() {
return tooltip_controller_.get();
}
@@ -357,9 +355,7 @@ class ASH_EXPORT Shell : public SystemModalContainerEventFilterDelegate,
MruWindowTracker* mru_window_tracker() {
return wm_shell_common_->mru_window_tracker();
}
- VideoDetector* video_detector() {
- return video_detector_.get();
- }
+ VideoDetector* video_detector() { return video_detector_.get(); }
WindowCycleController* window_cycle_controller() {
return window_cycle_controller_.get();
}
@@ -403,9 +399,7 @@ class ASH_EXPORT Shell : public SystemModalContainerEventFilterDelegate,
return new_window_delegate_.get();
}
- MediaDelegate* media_delegate() {
- return media_delegate_.get();
- }
+ MediaDelegate* media_delegate() { return media_delegate_.get(); }
HighContrastController* high_contrast_controller() {
return high_contrast_controller_.get();
@@ -431,9 +425,7 @@ class ASH_EXPORT Shell : public SystemModalContainerEventFilterDelegate,
return shelf_item_delegate_manager_.get();
}
- base::SequencedWorkerPool* blocking_pool() {
- return blocking_pool_;
- }
+ base::SequencedWorkerPool* blocking_pool() { return blocking_pool_; }
// Force the shelf to query for it's current visibility state.
// TODO(jamescook): Move to Shelf.
@@ -520,20 +512,14 @@ class ASH_EXPORT Shell : public SystemModalContainerEventFilterDelegate,
}
#endif // defined(OS_CHROMEOS)
- ShelfModel* shelf_model() {
- return shelf_model_.get();
- }
+ ShelfModel* shelf_model() { return shelf_model_.get(); }
- WindowPositioner* window_positioner() {
- return window_positioner_.get();
- }
+ WindowPositioner* window_positioner() { return window_positioner_.get(); }
// Returns the launcher delegate, creating if necesary.
ShelfDelegate* GetShelfDelegate();
- UserMetricsRecorder* metrics() {
- return user_metrics_recorder_.get();
- }
+ UserMetricsRecorder* metrics() { return user_metrics_recorder_.get(); }
void SetTouchHudProjectionEnabled(bool enabled);
« no previous file with comments | « ash/shelf/shelf_window_watcher_unittest.cc ('k') | ash/shell.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698