| Index: content/shell/browser/shell.cc
|
| diff --git a/content/shell/browser/shell.cc b/content/shell/browser/shell.cc
|
| index 12fde0b981f9818af5e2e58520567335a75aaf31..81c9cad0b32bd3d91b7e15e28506a990da3b9cc1 100644
|
| --- a/content/shell/browser/shell.cc
|
| +++ b/content/shell/browser/shell.cc
|
| @@ -4,15 +4,19 @@
|
|
|
| #include "content/shell/browser/shell.h"
|
|
|
| +#include <stddef.h>
|
| +
|
| #include "base/auto_reset.h"
|
| #include "base/command_line.h"
|
| #include "base/location.h"
|
| +#include "base/macros.h"
|
| #include "base/single_thread_task_runner.h"
|
| #include "base/strings/string_number_conversions.h"
|
| #include "base/strings/string_util.h"
|
| #include "base/strings/stringprintf.h"
|
| #include "base/strings/utf_string_conversions.h"
|
| #include "base/thread_task_runner_handle.h"
|
| +#include "build/build_config.h"
|
| #include "content/public/browser/devtools_agent_host.h"
|
| #include "content/public/browser/navigation_controller.h"
|
| #include "content/public/browser/navigation_entry.h"
|
| @@ -360,9 +364,9 @@ scoped_ptr<BluetoothChooser> Shell::RunBluetoothChooser(
|
| }
|
|
|
| bool Shell::AddMessageToConsole(WebContents* source,
|
| - int32 level,
|
| + int32_t level,
|
| const base::string16& message,
|
| - int32 line_no,
|
| + int32_t line_no,
|
| const base::string16& source_id) {
|
| return base::CommandLine::ForCurrentProcess()->HasSwitch(
|
| switches::kRunLayoutTest);
|
|
|