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

Side by Side Diff: chrome/browser/extensions/api/system_display/system_display_api.cc

Issue 138003007: [Cleanup] Screen cleanup (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: make sure screen_for_shutdown is reset everytime Created 6 years, 11 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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/extensions/api/system_display/system_display_api.h" 5 #include "chrome/browser/extensions/api/system_display/system_display_api.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/memory/scoped_ptr.h"
10 #include "base/strings/string_number_conversions.h"
11 #include "chrome/browser/extensions/api/system_display/display_info_provider.h" 9 #include "chrome/browser/extensions/api/system_display/display_info_provider.h"
12 #include "chrome/common/extensions/api/system_display.h" 10 #include "chrome/common/extensions/api/system_display.h"
11
12 #if defined(OS_CHROMEOS)
13 #include "base/memory/scoped_ptr.h"
13 #include "extensions/common/manifest_handlers/kiosk_mode_info.h" 14 #include "extensions/common/manifest_handlers/kiosk_mode_info.h"
14 #include "ui/gfx/display.h"
15 #include "ui/gfx/screen.h" 15 #include "ui/gfx/screen.h"
16 #endif
16 17
17 namespace extensions { 18 namespace extensions {
18 19
19 using api::system_display::DisplayUnitInfo; 20 using api::system_display::DisplayUnitInfo;
20 21
21 namespace SetDisplayProperties = api::system_display::SetDisplayProperties; 22 namespace SetDisplayProperties = api::system_display::SetDisplayProperties;
22 23
23 typedef std::vector<linked_ptr< 24 typedef std::vector<linked_ptr<
24 api::system_display::DisplayUnitInfo> > DisplayInfo; 25 api::system_display::DisplayUnitInfo> > DisplayInfo;
25 26
(...skipping 19 matching lines...) Expand all
45 bool success = DisplayInfoProvider::Get()->SetInfo(params->id, 46 bool success = DisplayInfoProvider::Get()->SetInfo(params->id,
46 params->info, 47 params->info,
47 &error); 48 &error);
48 if (!success) 49 if (!success)
49 SetError(error); 50 SetError(error);
50 return true; 51 return true;
51 #endif 52 #endif
52 } 53 }
53 54
54 } // namespace extensions 55 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698