diff options
| -rw-r--r-- | WATCHLISTS | 2 | ||||
| -rw-r--r-- | chrome/browser/nacl_host/nacl_broker_host.cc | 2 | ||||
| -rw-r--r-- | chrome/browser/nacl_host/nacl_broker_service.cc | 2 | ||||
| -rw-r--r-- | chrome/browser/nacl_host/nacl_process_host.cc (renamed from chrome/browser/nacl_process_host.cc) | 2 | ||||
| -rw-r--r-- | chrome/browser/nacl_host/nacl_process_host.h (renamed from chrome/browser/nacl_process_host.h) | 6 | ||||
| -rw-r--r-- | chrome/browser/renderer_host/resource_message_filter.cc | 2 | ||||
| -rwxr-xr-x | chrome/chrome_browser.gypi | 4 |
7 files changed, 10 insertions, 10 deletions
@@ -100,7 +100,7 @@ }, 'nacl': { 'filepath': 'chrome/nacl/.*|chrome/test/nacl/.*|'\ - 'chrome/browser/nacl_process_host.*|chrome/common/nacl.*', + 'chrome/browser/nacl_host/.*|chrome/common/nacl.*', }, 'appcache': { 'filepath': 'appcache/.*', diff --git a/chrome/browser/nacl_host/nacl_broker_host.cc b/chrome/browser/nacl_host/nacl_broker_host.cc index 8abc228..92ed181 100644 --- a/chrome/browser/nacl_host/nacl_broker_host.cc +++ b/chrome/browser/nacl_host/nacl_broker_host.cc @@ -8,7 +8,7 @@ #include "ipc/ipc_switches.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/nacl_host/nacl_broker_service.h" -#include "chrome/browser/nacl_process_host.h" +#include "chrome/browser/nacl_host/nacl_process_host.h" #include "chrome/common/chrome_constants.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/nacl_cmd_line.h" diff --git a/chrome/browser/nacl_host/nacl_broker_service.cc b/chrome/browser/nacl_host/nacl_broker_service.cc index ef659cd..76da887 100644 --- a/chrome/browser/nacl_host/nacl_broker_service.cc +++ b/chrome/browser/nacl_host/nacl_broker_service.cc @@ -5,7 +5,7 @@ #include "chrome/browser/nacl_host/nacl_broker_service.h" #include "chrome/browser/browser_process.h" -#include "chrome/browser/nacl_process_host.h" +#include "chrome/browser/nacl_host/nacl_process_host.h" #include "chrome/common/chrome_switches.h" NaClBrokerService* NaClBrokerService::GetInstance() { diff --git a/chrome/browser/nacl_process_host.cc b/chrome/browser/nacl_host/nacl_process_host.cc index c82b06d..2b3ebd2 100644 --- a/chrome/browser/nacl_process_host.cc +++ b/chrome/browser/nacl_host/nacl_process_host.cc @@ -4,7 +4,7 @@ #include "build/build_config.h" -#include "chrome/browser/nacl_process_host.h" +#include "chrome/browser/nacl_host/nacl_process_host.h" #if defined(OS_POSIX) #include <fcntl.h> diff --git a/chrome/browser/nacl_process_host.h b/chrome/browser/nacl_host/nacl_process_host.h index ca416f6..bf96b83 100644 --- a/chrome/browser/nacl_process_host.h +++ b/chrome/browser/nacl_host/nacl_process_host.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_BROWSER_NACL_PROCESS_HOST_H_ -#define CHROME_BROWSER_NACL_PROCESS_HOST_H_ +#ifndef CHROME_BROWSER_NACL_HOST_NACL_PROCESS_HOST_H_ +#define CHROME_BROWSER_NACL_HOST_NACL_PROCESS_HOST_H_ #include "build/build_config.h" @@ -79,4 +79,4 @@ class NaClProcessHost : public ChildProcessHost { DISALLOW_COPY_AND_ASSIGN(NaClProcessHost); }; -#endif // CHROME_BROWSER_NACL_PROCESS_HOST_H_ +#endif // CHROME_BROWSER_NACL_HOST_NACL_PROCESS_HOST_H_ diff --git a/chrome/browser/renderer_host/resource_message_filter.cc b/chrome/browser/renderer_host/resource_message_filter.cc index 6f427c3..342a3fe 100644 --- a/chrome/browser/renderer_host/resource_message_filter.cc +++ b/chrome/browser/renderer_host/resource_message_filter.cc @@ -20,7 +20,7 @@ #include "chrome/browser/extensions/extension_message_service.h" #include "chrome/browser/host_zoom_map.h" #include "chrome/browser/in_process_webkit/dom_storage_dispatcher_host.h" -#include "chrome/browser/nacl_process_host.h" +#include "chrome/browser/nacl_host/nacl_process_host.h" #include "chrome/browser/net/chrome_url_request_context.h" #include "chrome/browser/net/dns_global.h" #include "chrome/browser/notifications/desktop_notification_service.h" diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi index ff37766..fea9d48 100755 --- a/chrome/chrome_browser.gypi +++ b/chrome/chrome_browser.gypi @@ -1303,6 +1303,8 @@ 'browser/metrics/user_metrics.h', 'browser/modal_html_dialog_delegate.cc', 'browser/modal_html_dialog_delegate.h', + 'browser/nacl_host/nacl_process_host.cc', + 'browser/nacl_host/nacl_process_host.h', 'browser/net/browser_url_util.cc', 'browser/net/browser_url_util.h', 'browser/net/chrome_cookie_policy.cc', @@ -1609,8 +1611,6 @@ 'browser/search_engines/template_url_prepopulate_data.h', 'browser/search_engines/template_url_table_model.cc', 'browser/search_engines/template_url_table_model.h', - 'browser/nacl_process_host.cc', - 'browser/nacl_process_host.h', 'browser/session_startup_pref.cc', 'browser/session_startup_pref.h', 'browser/sessions/base_session_service.cc', |