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

Side by Side Diff: ui/aura/env.h

Issue 413303003: Remove const from int return type on aura::Env::mouse_button_flags() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 5 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 | « no previous file | no next file » | 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 #ifndef UI_AURA_ENV_H_ 5 #ifndef UI_AURA_ENV_H_
6 #define UI_AURA_ENV_H_ 6 #define UI_AURA_ENV_H_
7 7
8 #include "base/memory/scoped_ptr.h" 8 #include "base/memory/scoped_ptr.h"
9 #include "base/observer_list.h" 9 #include "base/observer_list.h"
10 #include "base/supports_user_data.h" 10 #include "base/supports_user_data.h"
(...skipping 24 matching lines...) Expand all
35 // |create_event_source| is true a PlatformEventSource is created. 35 // |create_event_source| is true a PlatformEventSource is created.
36 // TODO(sky): nuke |create_event_source|. Only necessary while mojo's 36 // TODO(sky): nuke |create_event_source|. Only necessary while mojo's
37 // nativeviewportservice lives in the same process as the viewmanager. 37 // nativeviewportservice lives in the same process as the viewmanager.
38 static void CreateInstance(bool create_event_source); 38 static void CreateInstance(bool create_event_source);
39 static Env* GetInstance(); 39 static Env* GetInstance();
40 static void DeleteInstance(); 40 static void DeleteInstance();
41 41
42 void AddObserver(EnvObserver* observer); 42 void AddObserver(EnvObserver* observer);
43 void RemoveObserver(EnvObserver* observer); 43 void RemoveObserver(EnvObserver* observer);
44 44
45 const int mouse_button_flags() const { return mouse_button_flags_; } 45 int mouse_button_flags() const { return mouse_button_flags_; }
46 void set_mouse_button_flags(int mouse_button_flags) { 46 void set_mouse_button_flags(int mouse_button_flags) {
47 mouse_button_flags_ = mouse_button_flags; 47 mouse_button_flags_ = mouse_button_flags;
48 } 48 }
49 // Returns true if a mouse button is down. This may query the native OS, 49 // Returns true if a mouse button is down. This may query the native OS,
50 // otherwise it uses |mouse_button_flags_|. 50 // otherwise it uses |mouse_button_flags_|.
51 bool IsMouseButtonDown() const; 51 bool IsMouseButtonDown() const;
52 52
53 // Gets/sets the last mouse location seen in a mouse event in the screen 53 // Gets/sets the last mouse location seen in a mouse event in the screen
54 // coordinates. 54 // coordinates.
55 const gfx::Point& last_mouse_location() const { return last_mouse_location_; } 55 const gfx::Point& last_mouse_location() const { return last_mouse_location_; }
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
103 scoped_ptr<ui::PlatformEventSource> event_source_; 103 scoped_ptr<ui::PlatformEventSource> event_source_;
104 104
105 ui::ContextFactory* context_factory_; 105 ui::ContextFactory* context_factory_;
106 106
107 DISALLOW_COPY_AND_ASSIGN(Env); 107 DISALLOW_COPY_AND_ASSIGN(Env);
108 }; 108 };
109 109
110 } // namespace aura 110 } // namespace aura
111 111
112 #endif // UI_AURA_ENV_H_ 112 #endif // UI_AURA_ENV_H_
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698