mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

No more basictypes.h

Browse source
This commit is contained in:
Cheng Zhao 2016-03-08 10:14:16 +09:00
parent 9fd88e9bb7
commit c72c89bd75
6 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
brightray/browser/devtools_contents_resizing_strategy.h
View file

@ -5,7 +5,7 @@
#ifndef BRIGHTRAY_BROWSER_DEVTOOLS_CONTENTS_RESIZING_STRATEGY_H_ #ifndef BRIGHTRAY_BROWSER_DEVTOOLS_CONTENTS_RESIZING_STRATEGY_H_
#define BRIGHTRAY_BROWSER_DEVTOOLS_CONTENTS_RESIZING_STRATEGY_H_ #define BRIGHTRAY_BROWSER_DEVTOOLS_CONTENTS_RESIZING_STRATEGY_H_
#include "base/basictypes.h" #include "base/macros.h"
#include "ui/gfx/geometry/insets.h" #include "ui/gfx/geometry/insets.h"
#include "ui/gfx/geometry/rect.h" #include "ui/gfx/geometry/rect.h"
#include "ui/gfx/geometry/size.h" #include "ui/gfx/geometry/size.h"

2
brightray/browser/devtools_manager_delegate.h
View file

@ -5,7 +5,7 @@
#ifndef BROWSER_DEVTOOLS_MANAGER_DELEGATE_H_ #ifndef BROWSER_DEVTOOLS_MANAGER_DELEGATE_H_
#define BROWSER_DEVTOOLS_MANAGER_DELEGATE_H_ #define BROWSER_DEVTOOLS_MANAGER_DELEGATE_H_
#include "base/basictypes.h" #include "base/macros.h"
#include "base/compiler_specific.h" #include "base/compiler_specific.h"
#include "components/devtools_http_handler/devtools_http_handler_delegate.h" #include "components/devtools_http_handler/devtools_http_handler_delegate.h"
#include "content/public/browser/devtools_manager_delegate.h" #include "content/public/browser/devtools_manager_delegate.h"

4
brightray/browser/inspectable_web_contents_impl.cc
View file

@ -592,9 +592,9 @@ void InspectableWebContentsImpl::WebContentsDestroyed() {
bool InspectableWebContentsImpl::AddMessageToConsole( bool InspectableWebContentsImpl::AddMessageToConsole(
content::WebContents* source, content::WebContents* source,
int32 level, int32_t level,
const base::string16& message, const base::string16& message,
int32 line_no, int32_t line_no,
const base::string16& source_id) { const base::string16& source_id) {
logging::LogMessage("CONSOLE", line_no, level).stream() << "\"" << logging::LogMessage("CONSOLE", line_no, level).stream() << "\"" <<
message << "\", source: " << source_id << " (" << line_no << ")"; message << "\", source: " << source_id << " (" << line_no << ")";

4
brightray/browser/inspectable_web_contents_impl.h
View file

@ -134,9 +134,9 @@ class InspectableWebContentsImpl :
// content::WebContentsDelegate: // content::WebContentsDelegate:
bool AddMessageToConsole(content::WebContents* source, bool AddMessageToConsole(content::WebContents* source,
int32 level, int32_t level,
const base::string16& message, const base::string16& message,
int32 line_no, int32_t line_no,
const base::string16& source_id) override; const base::string16& source_id) override;
bool ShouldCreateWebContents( bool ShouldCreateWebContents(
content::WebContents* web_contents, content::WebContents* web_contents,

2
brightray/browser/web_ui_controller_factory.h
View file

@ -5,7 +5,7 @@
#ifndef BRIGHTRAY_BROWSER_WEB_UI_CONTROLLER_FACTORY_H_ #ifndef BRIGHTRAY_BROWSER_WEB_UI_CONTROLLER_FACTORY_H_
#define BRIGHTRAY_BROWSER_WEB_UI_CONTROLLER_FACTORY_H_ #define BRIGHTRAY_BROWSER_WEB_UI_CONTROLLER_FACTORY_H_
#include "base/basictypes.h" #include "base/macros.h"
#include "content/public/browser/web_ui.h" #include "content/public/browser/web_ui.h"
#include "content/public/browser/web_ui_controller_factory.h" #include "content/public/browser/web_ui_controller_factory.h"

2
brightray/browser/win/scoped_hstring.h
View file

@ -10,7 +10,7 @@
#include <hstring.h> #include <hstring.h>
#include <windows.h> #include <windows.h>
#include "base/basictypes.h" #include "base/macros.h"
class ScopedHString { class ScopedHString {
public: public: