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

Side by Side Diff: src/platform/window_manager/window_manager.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/window_manager.h" 5 #include "window_manager/window_manager.h"
6 6
7 #include <queue> 7 #include <queue>
8 8
9 extern "C" { 9 extern "C" {
10 #include <gdk/gdkx.h> 10 #include <gdk/gdkx.h>
(...skipping 28 matching lines...) Expand all
39 "/usr/sbin/monitor_reconfigure", 39 "/usr/sbin/monitor_reconfigure",
40 "Command to configure an external monitor"); 40 "Command to configure an external monitor");
41 DEFINE_string(screenshot_binary, 41 DEFINE_string(screenshot_binary,
42 "/usr/bin/screenshot", 42 "/usr/bin/screenshot",
43 "Path to the screenshot binary"); 43 "Path to the screenshot binary");
44 DEFINE_string(screenshot_output_dir, 44 DEFINE_string(screenshot_output_dir,
45 ".", "Output directory for screenshots"); 45 ".", "Output directory for screenshots");
46 46
47 DEFINE_bool(wm_use_compositing, true, "Use compositing"); 47 DEFINE_bool(wm_use_compositing, true, "Use compositing");
48 48
49 namespace chromeos { 49 namespace window_manager {
50
51 using chromeos::Closure;
52 using chromeos::NewPermanentCallback;
50 53
51 const int WindowManager::kPanelBarHeight = 18; 54 const int WindowManager::kPanelBarHeight = 18;
52 55
53 // Time to spend fading the hotkey overlay in or out, in milliseconds. 56 // Time to spend fading the hotkey overlay in or out, in milliseconds.
54 static const int kHotkeyOverlayAnimMs = 100; 57 static const int kHotkeyOverlayAnimMs = 100;
55 58
56 static const char* XEventTypeToName(int type) { 59 static const char* XEventTypeToName(int type) {
57 switch (type) { 60 switch (type) {
58 CHROMEOS_CASE_RETURN_LABEL(ButtonPress); 61 CHROMEOS_CASE_RETURN_LABEL(ButtonPress);
59 CHROMEOS_CASE_RETURN_LABEL(ButtonRelease); 62 CHROMEOS_CASE_RETURN_LABEL(ButtonRelease);
(...skipping 1432 matching lines...) Expand 10 before | Expand all | Expand 10 after
1492 } else { 1495 } else {
1493 message = StringPrintf("Saved screenshot of window %s to %s", 1496 message = StringPrintf("Saved screenshot of window %s to %s",
1494 XidStr(xid).c_str(), filename.c_str()); 1497 XidStr(xid).c_str(), filename.c_str());
1495 LOG(INFO) << message; 1498 LOG(INFO) << message;
1496 } 1499 }
1497 } 1500 }
1498 1501
1499 // TODO: Display the message onscreen. 1502 // TODO: Display the message onscreen.
1500 } 1503 }
1501 1504
1502 } // namespace chromeos 1505 } // namespace window_manager
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698