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

Side by Side Diff: chromeos/cryptohome/homedir_methods.cc

Issue 947173002: Remove duplicate includes from chromeos/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 10 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 | « chromeos/cryptohome/async_method_caller.cc ('k') | chromeos/dbus/bluetooth_adapter_client.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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/cryptohome/homedir_methods.h" 5 #include "chromeos/cryptohome/homedir_methods.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/logging.h" 8 #include "base/logging.h"
9 #include "chromeos/dbus/cryptohome/key.pb.h" 9 #include "chromeos/dbus/cryptohome/key.pb.h"
10 #include "chromeos/dbus/cryptohome/rpc.pb.h" 10 #include "chromeos/dbus/cryptohome/rpc.pb.h"
11 #include "chromeos/dbus/cryptohome_client.h"
12 #include "chromeos/dbus/dbus_thread_manager.h" 11 #include "chromeos/dbus/dbus_thread_manager.h"
13 12
14 #if defined(USE_SYSTEM_PROTOBUF) 13 #if defined(USE_SYSTEM_PROTOBUF)
15 #include <google/protobuf/repeated_field.h> 14 #include <google/protobuf/repeated_field.h>
16 #else 15 #else
17 #include "third_party/protobuf/src/google/protobuf/repeated_field.h" 16 #include "third_party/protobuf/src/google/protobuf/repeated_field.h"
18 #endif 17 #endif
19 18
20 using chromeos::DBusThreadManager; 19 using chromeos::DBusThreadManager;
21 using google::protobuf::RepeatedPtrField; 20 using google::protobuf::RepeatedPtrField;
(...skipping 459 matching lines...) Expand 10 before | Expand all | Expand 10 after
481 } 480 }
482 delete g_homedir_methods; 481 delete g_homedir_methods;
483 g_homedir_methods = NULL; 482 g_homedir_methods = NULL;
484 VLOG(1) << "HomedirMethods Shutdown completed"; 483 VLOG(1) << "HomedirMethods Shutdown completed";
485 } 484 }
486 485
487 // static 486 // static
488 HomedirMethods* HomedirMethods::GetInstance() { return g_homedir_methods; } 487 HomedirMethods* HomedirMethods::GetInstance() { return g_homedir_methods; }
489 488
490 } // namespace cryptohome 489 } // namespace cryptohome
OLDNEW
« no previous file with comments | « chromeos/cryptohome/async_method_caller.cc ('k') | chromeos/dbus/bluetooth_adapter_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698