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

Side by Side Diff: ui/gfx/screen_android.cc

Issue 11363124: Move DisplayManager and DisplayChangeObserverX11 from aura to ash. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix rebase Created 8 years, 1 month 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 | « ui/gfx/screen.h ('k') | ui/gfx/screen_gtk.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 "ui/gfx/screen.h" 5 #include "ui/gfx/screen.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "ui/gfx/display.h" 8 #include "ui/gfx/display.h"
9 9
10 namespace gfx { 10 namespace gfx {
(...skipping 30 matching lines...) Expand all
41 41
42 int GetNumDisplays() OVERRIDE { 42 int GetNumDisplays() OVERRIDE {
43 return 1; 43 return 1;
44 } 44 }
45 45
46 virtual gfx::Display GetDisplayMatching( 46 virtual gfx::Display GetDisplayMatching(
47 const gfx::Rect& match_rect) const OVERRIDE { 47 const gfx::Rect& match_rect) const OVERRIDE {
48 return GetPrimaryDisplay(); 48 return GetPrimaryDisplay();
49 } 49 }
50 50
51 virtual void AddObserver(DisplayObserver* observer) OVERRIDE {
52 // no display change on Android.
53 }
54
55 virtual void RemoveObserver(DisplayObserver* observer) OVERRIDE {
56 // no display change on Android.
57 }
58
51 private: 59 private:
52 DISALLOW_COPY_AND_ASSIGN(ScreenAndroid); 60 DISALLOW_COPY_AND_ASSIGN(ScreenAndroid);
53 }; 61 };
54 62
55 Screen* CreateNativeScreen() { 63 Screen* CreateNativeScreen() {
56 return new ScreenAndroid; 64 return new ScreenAndroid;
57 } 65 }
58 66
59 } // namespace gfx 67 } // namespace gfx
OLDNEW
« no previous file with comments | « ui/gfx/screen.h ('k') | ui/gfx/screen_gtk.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698