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

Side by Side Diff: src/platform/window_manager/clutter_interface.cc

Issue 501116: wm: Update namespace and header define guards. (Closed)
Patch Set: move using directive inside of namespace for consistency Created 11 years 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 (c) 2009 The Chromium OS Authors. All rights reserved. 1 // Copyright (c) 2009 The Chromium OS 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 "window_manager/clutter_interface.h" 5 #include "window_manager/clutter_interface.h"
6 6
7 #include <cmath> 7 #include <cmath>
8 8
9 #include "base/string_util.h" 9 #include "base/string_util.h"
10 #include "chromeos/obsolete_logging.h" 10 #include "chromeos/obsolete_logging.h"
11 #include "window_manager/util.h" 11 #include "window_manager/util.h"
12 12
13 namespace chromeos { 13 namespace window_manager {
14 14
15 const int RealClutterInterface::TexturePixmapActor::kAlphaMaskLayerIndex = 1; 15 const int RealClutterInterface::TexturePixmapActor::kAlphaMaskLayerIndex = 1;
16 16
17 17
18 RealClutterInterface::Actor::Actor(ClutterActor* clutter_actor) 18 RealClutterInterface::Actor::Actor(ClutterActor* clutter_actor)
19 : clutter_actor_(clutter_actor) { 19 : clutter_actor_(clutter_actor) {
20 CHECK(clutter_actor_); 20 CHECK(clutter_actor_);
21 // Tell GLib to set 'clutter_actor_' to NULL when the ClutterActor object 21 // Tell GLib to set 'clutter_actor_' to NULL when the ClutterActor object
22 // is destroyed. 22 // is destroyed.
23 g_object_add_weak_pointer( 23 g_object_add_weak_pointer(
(...skipping 512 matching lines...) Expand 10 before | Expand all | Expand 10 after
536 memcpy(alpha_mask_bytes_, bytes, size); 536 memcpy(alpha_mask_bytes_, bytes, size);
537 return true; 537 return true;
538 } 538 }
539 539
540 void MockClutterInterface::TexturePixmapActor::ClearAlphaMask() { 540 void MockClutterInterface::TexturePixmapActor::ClearAlphaMask() {
541 delete[] alpha_mask_bytes_; 541 delete[] alpha_mask_bytes_;
542 alpha_mask_bytes_ = NULL; 542 alpha_mask_bytes_ = NULL;
543 } 543 }
544 544
545 } 545 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698