| OLD | NEW | 
|   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 "ui/display/chromeos/test/action_logger.h" |   5 #include "ui/display/manager/chromeos/test/action_logger.h" | 
|   6  |   6  | 
|   7 namespace ui { |   7 namespace ui { | 
|   8 namespace test { |   8 namespace test { | 
|   9  |   9  | 
|  10 ActionLogger::ActionLogger() { |  10 ActionLogger::ActionLogger() {} | 
|  11 } |  | 
|  12  |  11  | 
|  13 ActionLogger::~ActionLogger() { |  12 ActionLogger::~ActionLogger() {} | 
|  14 } |  | 
|  15  |  13  | 
|  16 void ActionLogger::AppendAction(const std::string& action) { |  14 void ActionLogger::AppendAction(const std::string& action) { | 
|  17   if (!actions_.empty()) |  15   if (!actions_.empty()) | 
|  18     actions_ += ","; |  16     actions_ += ","; | 
|  19   actions_ += action; |  17   actions_ += action; | 
|  20 } |  18 } | 
|  21  |  19  | 
|  22 std::string ActionLogger::GetActionsAndClear() { |  20 std::string ActionLogger::GetActionsAndClear() { | 
|  23   std::string actions = actions_; |  21   std::string actions = actions_; | 
|  24   actions_.clear(); |  22   actions_.clear(); | 
|  25   return actions; |  23   return actions; | 
|  26 } |  24 } | 
|  27  |  25  | 
|  28 }  // namespace test |  26 }  // namespace test | 
|  29 }  // namespace ui |  27 }  // namespace ui | 
| OLD | NEW |