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

Side by Side Diff: content/shell/shell_mac.mm

Issue 11614037: Call ShowRootWindow on NativeWindow's RootWindow to display the window. (Closed) Base URL: https://git.chromium.org/chromium/src.git@master
Patch Set: Fix mac build failure Created 7 years, 11 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
« no previous file with comments | « content/shell/shell_gtk.cc ('k') | content/shell/shell_win.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "content/shell/shell.h" 5 #include "content/shell/shell.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #import "base/memory/scoped_nsobject.h" 10 #import "base/memory/scoped_nsobject.h"
(...skipping 119 matching lines...) Expand 10 before | Expand all | Expand 10 after
130 [button setKeyEquivalent:key]; 130 [button setKeyEquivalent:key];
131 [button setKeyEquivalentModifierMask:modifier]; 131 [button setKeyEquivalentModifierMask:modifier];
132 [parent addSubview:button]; 132 [parent addSubview:button];
133 rect->origin.x += kButtonWidth; 133 rect->origin.x += kButtonWidth;
134 } 134 }
135 135
136 } // namespace 136 } // namespace
137 137
138 namespace content { 138 namespace content {
139 139
140 void Shell::PlatformInitialize() { 140 void Shell::PlatformInitialize(const gfx::Size& default_window_size) {
141 } 141 }
142 142
143 void Shell::PlatformCleanUp() { 143 void Shell::PlatformCleanUp() {
144 } 144 }
145 145
146 void Shell::PlatformEnableUIControl(UIControl control, bool is_enabled) { 146 void Shell::PlatformEnableUIControl(UIControl control, bool is_enabled) {
147 int id; 147 int id;
148 switch (control) { 148 switch (control) {
149 case BACK_BUTTON: 149 case BACK_BUTTON:
150 id = IDC_NAV_BACK; 150 id = IDC_NAV_BACK;
(...skipping 153 matching lines...) Expand 10 before | Expand all | Expand 10 after
304 [[event.os_event characters] isEqual:@"l"]) { 304 [[event.os_event characters] isEqual:@"l"]) {
305 [window_ makeFirstResponder:url_edit_view_]; 305 [window_ makeFirstResponder:url_edit_view_];
306 return; 306 return;
307 } 307 }
308 308
309 [[NSApp mainMenu] performKeyEquivalent:event.os_event]; 309 [[NSApp mainMenu] performKeyEquivalent:event.os_event];
310 } 310 }
311 } 311 }
312 312
313 } // namespace content 313 } // namespace content
OLDNEW
« no previous file with comments | « content/shell/shell_gtk.cc ('k') | content/shell/shell_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698