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

Side by Side Diff: chromeos/ime/ibus_daemon_controller.cc

Issue 23904025: Move IsRunningOnChromeOS to SysInfo (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge fix Created 7 years, 2 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
« no previous file with comments | « chromeos/display/output_configurator.cc ('k') | chromeos/ime/xkeyboard.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 "chromeos/ime/ibus_daemon_controller.h" 5 #include "chromeos/ime/ibus_daemon_controller.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/chromeos/chromeos_version.h"
9 #include "base/environment.h" 8 #include "base/environment.h"
10 #include "base/files/file_path_watcher.h" 9 #include "base/files/file_path_watcher.h"
11 #include "base/location.h" 10 #include "base/location.h"
12 #include "base/logging.h" 11 #include "base/logging.h"
13 #include "base/observer_list.h" 12 #include "base/observer_list.h"
14 #include "base/process/launch.h" 13 #include "base/process/launch.h"
15 #include "base/process/process_handle.h" 14 #include "base/process/process_handle.h"
16 #include "base/rand_util.h" 15 #include "base/rand_util.h"
17 #include "base/strings/string_util.h" 16 #include "base/strings/string_util.h"
18 #include "base/strings/stringprintf.h" 17 #include "base/strings/stringprintf.h"
(...skipping 325 matching lines...) Expand 10 before | Expand all | Expand 10 after
344 delete g_ibus_daemon_controller; 343 delete g_ibus_daemon_controller;
345 g_ibus_daemon_controller = NULL; 344 g_ibus_daemon_controller = NULL;
346 } 345 }
347 346
348 // static 347 // static
349 IBusDaemonController* IBusDaemonController::GetInstance() { 348 IBusDaemonController* IBusDaemonController::GetInstance() {
350 return g_ibus_daemon_controller; 349 return g_ibus_daemon_controller;
351 } 350 }
352 351
353 } // namespace chromeos 352 } // namespace chromeos
OLDNEW
« no previous file with comments | « chromeos/display/output_configurator.cc ('k') | chromeos/ime/xkeyboard.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698