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

Side by Side Diff: remoting/client/plugin/chromoting_instance.cc

Issue 9703098: Remove "base/values.h" import from "base/location.h", fix up downstream files. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix one more file on ChromiumOS Created 8 years, 9 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 | « remoting/client/plugin/chromoting_instance.h ('k') | no next file » | 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 "remoting/client/plugin/chromoting_instance.h" 5 #include "remoting/client/plugin/chromoting_instance.h"
6 6
7 #include <string> 7 #include <string>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/bind.h" 10 #include "base/bind.h"
11 #include "base/callback.h" 11 #include "base/callback.h"
12 #include "base/json/json_reader.h" 12 #include "base/json/json_reader.h"
13 #include "base/json/json_writer.h" 13 #include "base/json/json_writer.h"
14 #include "base/lazy_instance.h" 14 #include "base/lazy_instance.h"
15 #include "base/logging.h" 15 #include "base/logging.h"
16 #include "base/message_loop.h" 16 #include "base/message_loop.h"
17 #include "base/stringprintf.h" 17 #include "base/stringprintf.h"
18 #include "base/string_split.h" 18 #include "base/string_split.h"
19 #include "base/synchronization/lock.h" 19 #include "base/synchronization/lock.h"
20 #include "base/synchronization/waitable_event.h" 20 #include "base/synchronization/waitable_event.h"
21 #include "base/threading/thread.h" 21 #include "base/threading/thread.h"
22 #include "base/values.h"
22 #include "media/base/media.h" 23 #include "media/base/media.h"
23 #include "ppapi/cpp/completion_callback.h" 24 #include "ppapi/cpp/completion_callback.h"
24 #include "ppapi/cpp/input_event.h" 25 #include "ppapi/cpp/input_event.h"
25 #include "ppapi/cpp/rect.h" 26 #include "ppapi/cpp/rect.h"
26 // TODO(wez): Remove this when crbug.com/86353 is complete. 27 // TODO(wez): Remove this when crbug.com/86353 is complete.
27 #include "ppapi/cpp/private/var_private.h" 28 #include "ppapi/cpp/private/var_private.h"
28 #include "remoting/base/util.h" 29 #include "remoting/base/util.h"
29 #include "remoting/client/client_config.h" 30 #include "remoting/client/client_config.h"
30 #include "remoting/client/chromoting_client.h" 31 #include "remoting/client/chromoting_client.h"
31 #include "remoting/client/frame_consumer_proxy.h" 32 #include "remoting/client/frame_consumer_proxy.h"
(...skipping 507 matching lines...) Expand 10 before | Expand all | Expand 10 after
539 scoped_ptr<base::DictionaryValue> data(new base::DictionaryValue()); 540 scoped_ptr<base::DictionaryValue> data(new base::DictionaryValue());
540 data->SetString("message", message); 541 data->SetString("message", message);
541 PostChromotingMessage("logDebugMessage", data.Pass()); 542 PostChromotingMessage("logDebugMessage", data.Pass());
542 543
543 scriptable_object->LogDebugInfo(message); 544 scriptable_object->LogDebugInfo(message);
544 } 545 }
545 g_logging_to_plugin = false; 546 g_logging_to_plugin = false;
546 } 547 }
547 548
548 } // namespace remoting 549 } // namespace remoting
OLDNEW
« no previous file with comments | « remoting/client/plugin/chromoting_instance.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698