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

basictypes.h => macros.h

Browse source
This commit is contained in:
Paul Betts 2016-03-07 21:38:56 -08:00
parent 93c7126bc7
commit da59c0f58b
9 changed files with 12 additions and 12 deletions
Show stats 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_
#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/rect.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_
#define BROWSER_DEVTOOLS_MANAGER_DELEGATE_H_
#include "base/basictypes.h"
#include "base/macros.h"
#include "base/compiler_specific.h"
#include "components/devtools_http_handler/devtools_http_handler_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(
content::WebContents* source,
int32 level,
int32_t level,
const base::string16& message,
int32 line_no,
int32_t line_no,
const base::string16& source_id) {
logging::LogMessage("CONSOLE", line_no, level).stream() << "\"" <<
message << "\", source: " << source_id << " (" << line_no << ")";

4
brightray/browser/inspectable_web_contents_impl.h
View file

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

2
brightray/browser/net/devtools_network_interceptor.cc
View file

@ -207,7 +207,7 @@ void DevToolsNetworkInterceptor::ArmTimer(base::TimeTicks now) {
base::TimeTicks desired_time =
offset_ + tick_length_ * (last_tick_ + min_ticks_left);
int64_t min_baseline = std::numeric_limits<int64>::max();
int64_t min_baseline = std::numeric_limits<int64_t>::max();
for (size_t i = 0; i < suspend_count; ++i) {
if (suspended_transactions_[i].second < min_baseline)
min_baseline = suspended_transactions_[i].second;

2
brightray/browser/web_ui_controller_factory.h
View file

@ -5,7 +5,7 @@
#ifndef 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_controller_factory.h"

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

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

4
brightray/browser/win/windows_toast_notification.cc
View file

@ -330,7 +330,7 @@ bool WindowsToastNotification::GetTextNodeList(
ScopedHString* tag,
IXmlDocument* doc,
IXmlNodeList** node_list,
UINT32 req_length) {
Uint32_t req_length) {
tag->Reset(L"text");
if (!tag->success())
return false;
@ -338,7 +338,7 @@ bool WindowsToastNotification::GetTextNodeList(
if (FAILED(doc->GetElementsByTagName(*tag, node_list)))
return false;
UINT32 node_length;
Uint32_t node_length;
if (FAILED((*node_list)->get_Length(&node_length)))
return false;

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

@ -70,7 +70,7 @@ class WindowsToastNotification : public Notification {
bool GetTextNodeList(ScopedHString* tag,
ABI::Windows::Data::Xml::Dom::IXmlDocument* doc,
ABI::Windows::Data::Xml::Dom::IXmlNodeList** nodeList,
UINT32 reqLength);
Uint32_t reqLength);
bool AppendTextToXml(ABI::Windows::Data::Xml::Dom::IXmlDocument* doc,
ABI::Windows::Data::Xml::Dom::IXmlNode* node,
const std::wstring& text);