Skip to content

Commit 4ab94dc

Browse files
rogerwangrogerwang
committed
nw12: rebase fix for mac
1 parent 50193b3 commit 4ab94dc

12 files changed

+77
-64
lines changed

‎nw.gypi

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -237,6 +237,7 @@
237237
'src/browser/chrome_event_processing_window.h',
238238
'src/browser/file_select_helper.cc',
239239
'src/browser/file_select_helper.h',
240+
'src/browser/file_select_helper_mac.mm',
240241
'src/browser/menubar_controller.cc',
241242
'src/browser/menubar_controller.h',
242243
'src/browser/menubar_view.cc',
@@ -478,8 +479,8 @@
478479
'src/api/menu/menu_delegate.h',
479480
],
480481
'sources': [
481-
'<(DEPTH)/chrome/browser/ui/cocoa/nsview_additions.h',
482-
'<(DEPTH)/chrome/browser/ui/cocoa/nsview_additions.mm',
482+
#'<(DEPTH)/chrome/browser/ui/cocoa/web_contents_modal_dialog_manager_cocoa.mm',
483+
'src/browser/shell_web_contents_modal_dialog_manager.cc',
483484
],
484485
'dependencies': [
485486
'<(DEPTH)/breakpad/breakpad.gyp:breakpad',
@@ -624,6 +625,13 @@
624625
},
625626
'includes': [ '../../build/grit_action.gypi' ],
626627
},
628+
{
629+
'action_name': 'res_from_chrome',
630+
'variables': {
631+
'grit_grd_file': '../../chrome/app/generated_resources.grd',
632+
},
633+
'includes': [ '../../build/grit_action.gypi' ],
634+
},
627635
],
628636
},
629637
{

‎src/api/shortcut/global_shortcut_listener_mac.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,12 +57,12 @@ class GlobalShortcutListenerMac : public GlobalShortcutListener {
5757
bool OnMediaKeyEvent(int key_code);
5858

5959
// GlobalShortcutListener implementation.
60-
virtual void StartListening() OVERRIDE;
61-
virtual void StopListening() OVERRIDE;
60+
virtual void StartListening() override;
61+
virtual void StopListening() override;
6262
virtual bool RegisterAcceleratorImpl(
63-
const ui::Accelerator& accelerator) OVERRIDE;
63+
const ui::Accelerator& accelerator) override;
6464
virtual void UnregisterAcceleratorImpl(
65-
const ui::Accelerator& accelerator) OVERRIDE;
65+
const ui::Accelerator& accelerator) override;
6666

6767
// Mac-specific functions for registering hot keys with modifiers.
6868
bool RegisterHotKey(const ui::Accelerator& accelerator, KeyId hot_key_id);

‎src/browser/autofill_popup_view_bridge.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,10 @@ class AutofillPopupViewBridge : public AutofillPopupView {
3131
virtual ~AutofillPopupViewBridge();
3232

3333
// AutofillPopupView implementation.
34-
virtual void Hide() OVERRIDE;
35-
virtual void Show() OVERRIDE;
36-
virtual void InvalidateRow(size_t row) OVERRIDE;
37-
virtual void UpdateBoundsAndRedrawPopup() OVERRIDE;
34+
virtual void Hide() override;
35+
virtual void Show() override;
36+
virtual void InvalidateRow(size_t row) override;
37+
virtual void UpdateBoundsAndRedrawPopup() override;
3838

3939
// Set the initial bounds of the popup, including its placement.
4040
void SetInitialBounds();

‎src/browser/chrome_crash_reporter_client_mac.mm

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
#include "base/mac/scoped_cftyperef.h"
1010
#include "base/strings/sys_string_conversions.h"
11-
#include "policy/policy_constants.h"
11+
//#include "policy/policy_constants.h"
1212

1313
#if !defined(DISABLE_NACL)
1414
#include "base/command_line.h"
@@ -44,6 +44,7 @@ bool NaClBreakpadCrashFilter(int exception_type,
4444

4545
bool ChromeCrashReporterClient::ReportingIsEnforcedByPolicy(
4646
bool* breakpad_enabled) {
47+
#if 0
4748
base::ScopedCFTypeRef<CFStringRef> key(
4849
base::SysUTF8ToCFStringRef(policy::key::kMetricsReportingEnabled));
4950
Boolean key_valid;
@@ -54,6 +55,7 @@ bool NaClBreakpadCrashFilter(int exception_type,
5455
*breakpad_enabled = metrics_reporting_enabled;
5556
return true;
5657
}
58+
#endif
5759
return false;
5860
}
5961

‎src/browser/color_chooser_mac.mm

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@ - (void)setColor:(NSColor*)color;
4545
void DidChooseColorInColorPanel(SkColor color);
4646
void DidCloseColorPabel();
4747

48-
virtual void End() OVERRIDE;
49-
virtual void SetSelectedColor(SkColor color) OVERRIDE;
48+
virtual void End() override;
49+
virtual void SetSelectedColor(SkColor color) override;
5050

5151
private:
5252
static ColorChooserMac* current_color_chooser_;

‎src/browser/native_window_mac.h

Lines changed: 39 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -41,43 +41,43 @@ class NativeWindowCocoa : public NativeWindow {
4141
virtual ~NativeWindowCocoa();
4242

4343
// NativeWindow implementation.
44-
virtual void Close() OVERRIDE;
45-
virtual void Move(const gfx::Rect& pos) OVERRIDE;
46-
virtual void Focus(bool focus) OVERRIDE;
47-
virtual void Show() OVERRIDE;
48-
virtual void Hide() OVERRIDE;
49-
virtual void Maximize() OVERRIDE;
50-
virtual void Unmaximize() OVERRIDE;
51-
virtual void Minimize() OVERRIDE;
52-
virtual void Restore() OVERRIDE;
53-
virtual void SetFullscreen(bool fullscreen) OVERRIDE;
54-
virtual bool IsFullscreen() OVERRIDE;
55-
virtual void SetTransparent(bool transparent) OVERRIDE;
56-
virtual void SetSize(const gfx::Size& size) OVERRIDE;
57-
virtual gfx::Size GetSize() OVERRIDE;
58-
virtual void SetMinimumSize(int width, int height) OVERRIDE;
59-
virtual void SetMaximumSize(int width, int height) OVERRIDE;
60-
virtual void SetResizable(bool resizable) OVERRIDE;
61-
virtual void SetAlwaysOnTop(bool top) OVERRIDE;
62-
virtual void SetShowInTaskbar(bool show = true) OVERRIDE;
63-
virtual void SetVisibleOnAllWorkspaces(bool all_workspaces) OVERRIDE;
64-
virtual void SetPosition(const std::string& position) OVERRIDE;
65-
virtual void SetPosition(const gfx::Point& position) OVERRIDE;
66-
virtual gfx::Point GetPosition() OVERRIDE;
67-
virtual void SetTitle(const std::string& title) OVERRIDE;
68-
virtual void FlashFrame(int count) OVERRIDE;
69-
virtual void SetBadgeLabel(const std::string& badge) OVERRIDE;
70-
virtual void SetProgressBar(double progress) OVERRIDE;
71-
virtual void SetKiosk(bool kiosk) OVERRIDE;
72-
virtual bool IsKiosk() OVERRIDE;
73-
virtual void SetMenu(nwapi::Menu* menu) OVERRIDE;
74-
virtual void ClearMenu() OVERRIDE;
44+
virtual void Close() override;
45+
virtual void Move(const gfx::Rect& pos) override;
46+
virtual void Focus(bool focus) override;
47+
virtual void Show() override;
48+
virtual void Hide() override;
49+
virtual void Maximize() override;
50+
virtual void Unmaximize() override;
51+
virtual void Minimize() override;
52+
virtual void Restore() override;
53+
virtual void SetFullscreen(bool fullscreen) override;
54+
virtual bool IsFullscreen() override;
55+
virtual void SetTransparent(bool transparent) override;
56+
virtual void SetSize(const gfx::Size& size) override;
57+
virtual gfx::Size GetSize() override;
58+
virtual void SetMinimumSize(int width, int height) override;
59+
virtual void SetMaximumSize(int width, int height) override;
60+
virtual void SetResizable(bool resizable) override;
61+
virtual void SetAlwaysOnTop(bool top) override;
62+
virtual void SetShowInTaskbar(bool show = true) override;
63+
virtual void SetVisibleOnAllWorkspaces(bool all_workspaces) override;
64+
virtual void SetPosition(const std::string& position) override;
65+
virtual void SetPosition(const gfx::Point& position) override;
66+
virtual gfx::Point GetPosition() override;
67+
virtual void SetTitle(const std::string& title) override;
68+
virtual void FlashFrame(int count) override;
69+
virtual void SetBadgeLabel(const std::string& badge) override;
70+
virtual void SetProgressBar(double progress) override;
71+
virtual void SetKiosk(bool kiosk) override;
72+
virtual bool IsKiosk() override;
73+
virtual void SetMenu(nwapi::Menu* menu) override;
74+
virtual void ClearMenu() override;
7575
virtual void SetToolbarButtonEnabled(TOOLBAR_BUTTON button,
76-
bool enabled) OVERRIDE;
77-
virtual void SetToolbarUrlEntry(const std::string& url) OVERRIDE;
78-
virtual void SetToolbarIsLoading(bool loading) OVERRIDE;
79-
virtual void SetInitialFocus(bool accept_focus) OVERRIDE;
80-
virtual bool InitialFocus() OVERRIDE;
76+
bool enabled) override;
77+
virtual void SetToolbarUrlEntry(const std::string& url) override;
78+
virtual void SetToolbarIsLoading(bool loading) override;
79+
virtual void SetInitialFocus(bool accept_focus) override;
80+
virtual bool InitialFocus() override;
8181

8282
// Called to handle a mouse event.
8383
void HandleMouseEvent(NSEvent* event);
@@ -91,11 +91,11 @@ class NativeWindowCocoa : public NativeWindow {
9191

9292
protected:
9393
// NativeWindow implementation.
94-
virtual void AddToolbar() OVERRIDE;
94+
virtual void AddToolbar() override;
9595
virtual void UpdateDraggableRegions(
96-
const std::vector<extensions::DraggableRegion>& regions) OVERRIDE;
96+
const std::vector<extensions::DraggableRegion>& regions) override;
9797
virtual void HandleKeyboardEvent(
98-
const content::NativeWebKeyboardEvent& event) OVERRIDE;
98+
const content::NativeWebKeyboardEvent& event) override;
9999

100100
void SetNonLionFullscreen(bool fullscreen);
101101

‎src/browser/native_window_mac.mm

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
#include "base/strings/sys_string_conversions.h"
2525
#include "base/values.h"
2626
#import "chrome/browser/ui/cocoa/custom_frame_view.h"
27-
#import "chrome/browser/ui/cocoa/nsview_additions.h"
27+
#import "ui/base/cocoa/nsview_additions.h"
2828
#include "content/nw/src/api/menu/menu.h"
2929
#include "content/nw/src/api/app/app.h"
3030
#include "content/nw/src/browser/chrome_event_processing_window.h"
@@ -36,6 +36,7 @@
3636
#include "content/nw/src/nw_shell.h"
3737
#include "content/public/browser/native_web_keyboard_event.h"
3838
#include "content/browser/renderer_host/render_widget_host_view_mac.h"
39+
#include "content/browser/renderer_host/render_view_host_impl.h"
3940
#include "content/public/browser/web_contents.h"
4041
#include "extensions/common/draggable_region.h"
4142
#include "third_party/skia/include/core/SkRegion.h"
@@ -502,11 +503,12 @@ - (void)drawRect:(NSRect)dirtyRect {
502503
// Chrome assumption is that becoming the first responder = you have focus
503504
// so we use this trick to refuse to become first responder during orderFrontRegardless
504505

505-
if (rwhv)
506-
rwhv->SetTakesFocusOnlyOnMouseDown(true);
506+
// TODO(roger)
507+
// if (rwhv)
508+
// rwhv->SetTakesFocusOnlyOnMouseDown(true);
507509
[window() orderFrontRegardless];
508-
if (rwhv)
509-
rwhv->SetTakesFocusOnlyOnMouseDown(false);
510+
// if (rwhv)
511+
// rwhv->SetTakesFocusOnlyOnMouseDown(false);
510512
}
511513
first_show_ = false;
512514
}
@@ -562,9 +564,10 @@ - (void)drawRect:(NSRect)dirtyRect {
562564
[window() setBackgroundColor:transparent ? [NSColor clearColor] : opaque_color_];
563565

564566
content::RenderWidgetHostViewMac* rwhv = static_cast<content::RenderWidgetHostViewMac*>(shell_->web_contents()->GetRenderWidgetHostView());
567+
content::RenderViewHostImpl* rvh = static_cast<content::RenderViewHostImpl*>(shell_->web_contents()->GetRenderViewHost());
565568

566569
if (rwhv) {
567-
rwhv->SetBackgroundOpaque(!transparent);
570+
rvh->SetBackgroundOpaque(!transparent);
568571
[rwhv->background_layer_ setBackgroundColor:CGColorGetConstantColor(transparent ? kCGColorClear : kCGColorWhite)];
569572
}
570573

‎src/browser/shell_download_manager_delegate_mac.mm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
#include <Foundation/NSURL.h>
2525

2626
#include "base/bind.h"
27-
#include "base/file_util.h"
27+
#include "base/files/file_util.h"
2828
#include "base/files/file_path.h"
2929
#include "base/logging.h"
3030
#include "base/strings/string_util.h"

‎src/browser/shell_extensions_browser_client.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
#include "extensions/browser/null_app_sorting.h"
2020
#include "extensions/browser/updater/null_extension_cache.h"
2121
#include "extensions/browser/url_request_util.h"
22-
#include "extensions/shell/browser/api/generated_api_registration.h"
22+
//#include "extensions/shell/browser/api/generated_api_registration.h"
2323
#include "extensions/shell/browser/shell_extension_host_delegate.h"
2424
#include "extensions/shell/browser/shell_extension_system_factory.h"
2525
#include "extensions/shell/browser/shell_runtime_api_delegate.h"

‎src/common/shell_extensions_client.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
#include "extensions/common/permissions/permissions_info.h"
2121
#include "extensions/common/permissions/permissions_provider.h"
2222
#include "extensions/common/url_pattern_set.h"
23-
#include "extensions/shell/common/api/generated_schemas.h"
23+
//#include "extensions/shell/common/api/generated_schemas.h"
2424
//#include "grit/app_shell_resources.h"
2525
#include "grit/extensions_resources.h"
2626

‎src/renderer/printing/print_web_view_helper.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
#include "chrome/common/chrome_switches.h"
2020
#include "chrome/common/print_messages.h"
2121
#include "chrome/common/render_messages.h"
22-
#include "chrome/grit/browser_resources.h"
22+
//#include "chrome/grit/browser_resources.h"
2323
#include "chrome/renderer/prerender/prerender_helper.h"
2424
#include "content/public/common/web_preferences.h"
2525
#include "content/public/renderer/render_frame.h"

‎src/shell_main_delegate.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,14 +55,14 @@
5555
using base::FilePath;
5656

5757
#if defined(OS_MACOSX)
58-
#include "components/breakpad/app/breakpad_mac.h"
58+
#include "components/crash/app/breakpad_mac.h"
5959
#include "content/nw/src/paths_mac.h"
6060
#endif // OS_MACOSX
6161

6262
#if defined(OS_WIN)
6363
#include "base/logging_win.h"
6464
#include <initguid.h>
65-
#include "components/breakpad/app/breakpad_win.h"
65+
#include "components/crash/app/breakpad_win.h"
6666
#endif
6767

6868
#if defined(OS_POSIX) && !defined(OS_MACOSX)

0 commit comments

Comments
 (0)