Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(281)

Side by Side Diff: chrome/browser/ui/views/apps/app_window_native_widget_mac.mm

Issue 1259513002: [MacViews] Use ChromeCommandDispatcherDelegate to handle keyboard shortcuts. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@commandexecute
Patch Set: Address comments. Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/ui/views/apps/app_window_native_widget_mac.h" 5 #include "chrome/browser/ui/views/apps/app_window_native_widget_mac.h"
6 6
7 #import <Cocoa/Cocoa.h> 7 #import <Cocoa/Cocoa.h>
8 8
9 #import "chrome/browser/ui/cocoa/apps/titlebar_background_view.h" 9 #import "chrome/browser/ui/cocoa/apps/titlebar_background_view.h"
10 #import "chrome/browser/ui/views/frame/native_widget_mac_frameless_nswindow.h" 10 #import "chrome/browser/ui/views/frame/native_widget_mac_frameless_nswindow.h"
11 #include "extensions/browser/app_window/native_app_window.h" 11 #include "extensions/browser/app_window/native_app_window.h"
12 #import "ui/base/cocoa/window_size_constants.h" 12 #import "ui/base/cocoa/window_size_constants.h"
13 13
14 AppWindowNativeWidgetMac::AppWindowNativeWidgetMac( 14 AppWindowNativeWidgetMac::AppWindowNativeWidgetMac(
15 views::Widget* widget, 15 views::Widget* widget,
16 extensions::NativeAppWindow* native_app_window) 16 extensions::NativeAppWindow* native_app_window)
17 : NativeWidgetMac(widget), native_app_window_(native_app_window) { 17 : NativeWidgetMac(widget), native_app_window_(native_app_window) {
18 } 18 }
19 19
20 AppWindowNativeWidgetMac::~AppWindowNativeWidgetMac() { 20 AppWindowNativeWidgetMac::~AppWindowNativeWidgetMac() {
21 } 21 }
22 22
23 NSWindow* AppWindowNativeWidgetMac::CreateNSWindow( 23 NativeWidgetMacNSWindow* AppWindowNativeWidgetMac::CreateNSWindow(
24 const views::Widget::InitParams& params) { 24 const views::Widget::InitParams& params) {
25 // If the window has a native or colored frame, use the same NSWindow as 25 // If the window has a native or colored frame, use the same NSWindow as
26 // NativeWidgetMac. 26 // NativeWidgetMac.
27 if (!native_app_window_->IsFrameless()) { 27 if (!native_app_window_->IsFrameless()) {
28 NSWindow* ns_window = NativeWidgetMac::CreateNSWindow(params); 28 NativeWidgetMacNSWindow* ns_window =
29 NativeWidgetMac::CreateNSWindow(params);
29 if (native_app_window_->HasFrameColor()) { 30 if (native_app_window_->HasFrameColor()) {
30 [TitlebarBackgroundView 31 [TitlebarBackgroundView
31 addToNSWindow:ns_window 32 addToNSWindow:ns_window
32 activeColor:native_app_window_->ActiveFrameColor() 33 activeColor:native_app_window_->ActiveFrameColor()
33 inactiveColor:native_app_window_->InactiveFrameColor()]; 34 inactiveColor:native_app_window_->InactiveFrameColor()];
34 } 35 }
35 return ns_window; 36 return ns_window;
36 } 37 }
37 38
38 // NSTexturedBackgroundWindowMask is needed to implement draggable window 39 // NSTexturedBackgroundWindowMask is needed to implement draggable window
39 // regions. 40 // regions.
40 NSUInteger style_mask = NSTexturedBackgroundWindowMask | NSTitledWindowMask | 41 NSUInteger style_mask = NSTexturedBackgroundWindowMask | NSTitledWindowMask |
41 NSClosableWindowMask | NSMiniaturizableWindowMask | 42 NSClosableWindowMask | NSMiniaturizableWindowMask |
42 NSResizableWindowMask; 43 NSResizableWindowMask;
43 return [[[NativeWidgetMacFramelessNSWindow alloc] 44 return [[[NativeWidgetMacFramelessNSWindow alloc]
44 initWithContentRect:ui::kWindowSizeDeterminedLater 45 initWithContentRect:ui::kWindowSizeDeterminedLater
45 styleMask:style_mask 46 styleMask:style_mask
46 backing:NSBackingStoreBuffered 47 backing:NSBackingStoreBuffered
47 defer:NO] autorelease]; 48 defer:NO] autorelease];
48 } 49 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/apps/app_window_native_widget_mac.h ('k') | chrome/browser/ui/views/frame/browser_frame_mac.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698