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

Side by Side Diff: chrome/browser/ui/ash/palette_delegate_chromeos.cc

Issue 2276233002: ash/chromeos: Add shift-alt-p shortcut to open palette. (Closed)
Patch Set: Address comments Created 4 years, 3 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
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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 "chrome/browser/ui/ash/palette_delegate_chromeos.h" 5 #include "chrome/browser/ui/ash/palette_delegate_chromeos.h"
6 6
7 #include "ash/accelerators/accelerator_controller_delegate_aura.h" 7 #include "ash/accelerators/accelerator_controller_delegate_aura.h"
8 #include "ash/magnifier/partial_magnification_controller.h" 8 #include "ash/magnifier/partial_magnification_controller.h"
9 #include "ash/screenshot_delegate.h" 9 #include "ash/screenshot_delegate.h"
10 #include "ash/shell.h" 10 #include "ash/shell.h"
(...skipping 116 matching lines...) Expand 10 before | Expand all | Expand 10 after
127 on_stylus_state_changed_ = on_stylus_state_changed; 127 on_stylus_state_changed_ = on_stylus_state_changed;
128 } 128 }
129 129
130 bool PaletteDelegateChromeOS::ShouldAutoOpenPalette() { 130 bool PaletteDelegateChromeOS::ShouldAutoOpenPalette() {
131 if (!profile_) 131 if (!profile_)
132 return false; 132 return false;
133 133
134 return profile_->GetPrefs()->GetBoolean(prefs::kLaunchPaletteOnEjectEvent); 134 return profile_->GetPrefs()->GetBoolean(prefs::kLaunchPaletteOnEjectEvent);
135 } 135 }
136 136
137 bool PaletteDelegateChromeOS::ShouldShowPalette() {
138 if (!profile_)
139 return false;
140
141 return profile_->GetPrefs()->GetBoolean(prefs::kEnableStylusTools);
142 }
143
137 void PaletteDelegateChromeOS::TakeScreenshot() { 144 void PaletteDelegateChromeOS::TakeScreenshot() {
138 auto* screenshot_delegate = ash::Shell::GetInstance() 145 auto* screenshot_delegate = ash::Shell::GetInstance()
139 ->accelerator_controller_delegate() 146 ->accelerator_controller_delegate()
140 ->screenshot_delegate(); 147 ->screenshot_delegate();
141 screenshot_delegate->HandleTakeScreenshotForAllRootWindows(); 148 screenshot_delegate->HandleTakeScreenshotForAllRootWindows();
142 } 149 }
143 150
144 void PaletteDelegateChromeOS::TakePartialScreenshot() { 151 void PaletteDelegateChromeOS::TakePartialScreenshot() {
145 auto* screenshot_controller = 152 auto* screenshot_controller =
146 ash::Shell::GetInstance()->screenshot_controller(); 153 ash::Shell::GetInstance()->screenshot_controller();
147 auto* screenshot_delegate = ash::Shell::GetInstance() 154 auto* screenshot_delegate = ash::Shell::GetInstance()
148 ->accelerator_controller_delegate() 155 ->accelerator_controller_delegate()
149 ->screenshot_delegate(); 156 ->screenshot_delegate();
150 157
151 screenshot_controller->set_pen_events_only(true); 158 screenshot_controller->set_pen_events_only(true);
152 screenshot_controller->StartPartialScreenshotSession( 159 screenshot_controller->StartPartialScreenshotSession(
153 screenshot_delegate, false /* draw_overlay_immediately */); 160 screenshot_delegate, false /* draw_overlay_immediately */);
154 } 161 }
155 162
156 void PaletteDelegateChromeOS::OnStylusStateChanged(ui::StylusState state) { 163 void PaletteDelegateChromeOS::OnStylusStateChanged(ui::StylusState state) {
157 on_stylus_state_changed_.Run(state); 164 on_stylus_state_changed_.Run(state);
158 } 165 }
159 166
160 } // namespace chromeos 167 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698