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

Side by Side Diff: ash/shell/shell_delegate_impl.cc

Issue 2291913002: Allow the user to cancel the capture region action, and show its active status in the tray. (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
« no previous file with comments | « ash/common/test/test_palette_delegate.cc ('k') | ash/utility/screenshot_controller.h » ('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/shell/shell_delegate_impl.h" 5 #include "ash/shell/shell_delegate_impl.h"
6 6
7 #include "ash/app_list/app_list_presenter_delegate_factory.h" 7 #include "ash/app_list/app_list_presenter_delegate_factory.h"
8 #include "ash/common/accessibility_delegate.h" 8 #include "ash/common/accessibility_delegate.h"
9 #include "ash/common/default_accessibility_delegate.h" 9 #include "ash/common/default_accessibility_delegate.h"
10 #include "ash/common/gpu_support_stub.h" 10 #include "ash/common/gpu_support_stub.h"
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after
85 ~PaletteDelegateImpl() override {} 85 ~PaletteDelegateImpl() override {}
86 86
87 // PaletteDelegate: 87 // PaletteDelegate:
88 std::unique_ptr<EnableListenerSubscription> AddPaletteEnableListener( 88 std::unique_ptr<EnableListenerSubscription> AddPaletteEnableListener(
89 const EnableListener& on_state_changed) override { 89 const EnableListener& on_state_changed) override {
90 on_state_changed.Run(false); 90 on_state_changed.Run(false);
91 return nullptr; 91 return nullptr;
92 } 92 }
93 void CreateNote() override {} 93 void CreateNote() override {}
94 bool HasNoteApp() override { return false; } 94 bool HasNoteApp() override { return false; }
95 void OnLaserPointerEnabled() override {}
96 void OnLaserPointerDisabled() override {}
95 void SetPartialMagnifierState(bool enabled) override {} 97 void SetPartialMagnifierState(bool enabled) override {}
96 void SetStylusStateChangedCallback( 98 void SetStylusStateChangedCallback(
97 const OnStylusStateChangedCallback& on_stylus_state_changed) override {} 99 const OnStylusStateChangedCallback& on_stylus_state_changed) override {}
98 bool ShouldAutoOpenPalette() override { return false; } 100 bool ShouldAutoOpenPalette() override { return false; }
99 bool ShouldShowPalette() override { return false; } 101 bool ShouldShowPalette() override { return false; }
100 void TakeScreenshot() override {} 102 void TakeScreenshot() override {}
101 void TakePartialScreenshot() override {} 103 void TakePartialScreenshot(const base::Closure& done) override {
102 void OnLaserPointerEnabled() override {} 104 if (done)
103 void OnLaserPointerDisabled() override {} 105 done.Run();
106 }
107 void CancelPartialScreenshot() override {}
104 108
105 private: 109 private:
106 DISALLOW_COPY_AND_ASSIGN(PaletteDelegateImpl); 110 DISALLOW_COPY_AND_ASSIGN(PaletteDelegateImpl);
107 }; 111 };
108 112
109 class SessionStateDelegateImpl : public SessionStateDelegate { 113 class SessionStateDelegateImpl : public SessionStateDelegate {
110 public: 114 public:
111 SessionStateDelegateImpl() 115 SessionStateDelegateImpl()
112 : screen_locked_(false), user_info_(new user_manager::UserInfoImpl()) {} 116 : screen_locked_(false), user_info_(new user_manager::UserInfoImpl()) {}
113 117
(...skipping 173 matching lines...) Expand 10 before | Expand all | Expand 10 after
287 base::string16 ShellDelegateImpl::GetProductName() const { 291 base::string16 ShellDelegateImpl::GetProductName() const {
288 return base::string16(); 292 return base::string16();
289 } 293 }
290 294
291 gfx::Image ShellDelegateImpl::GetDeprecatedAcceleratorImage() const { 295 gfx::Image ShellDelegateImpl::GetDeprecatedAcceleratorImage() const {
292 return gfx::Image(); 296 return gfx::Image();
293 } 297 }
294 298
295 } // namespace shell 299 } // namespace shell
296 } // namespace ash 300 } // namespace ash
OLDNEW
« no previous file with comments | « ash/common/test/test_palette_delegate.cc ('k') | ash/utility/screenshot_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698