OLD | NEW |
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 #import "chrome/browser/ui/cocoa/applescript/window_applescript.h" | 5 #import "chrome/browser/ui/cocoa/applescript/window_applescript.h" |
6 | 6 |
7 #include "base/logging.h" | 7 #include "base/logging.h" |
8 #import "base/mac/scoped_nsobject.h" | 8 #import "base/mac/scoped_nsobject.h" |
9 #include "base/memory/scoped_ptr.h" | 9 #include "base/memory/scoped_ptr.h" |
10 #include "base/time/time.h" | 10 #include "base/time/time.h" |
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
68 return [self initWithProfile:profile]; | 68 return [self initWithProfile:profile]; |
69 } | 69 } |
70 | 70 |
71 - (id)initWithProfile:(Profile*)aProfile { | 71 - (id)initWithProfile:(Profile*)aProfile { |
72 if (!aProfile) { | 72 if (!aProfile) { |
73 [self release]; | 73 [self release]; |
74 return nil; | 74 return nil; |
75 } | 75 } |
76 | 76 |
77 if ((self = [super init])) { | 77 if ((self = [super init])) { |
78 browser_ = new Browser( | 78 browser_ = new Browser(Browser::CreateParams(aProfile)); |
79 Browser::CreateParams(aProfile, chrome::HOST_DESKTOP_TYPE_NATIVE)); | |
80 chrome::NewTab(browser_); | 79 chrome::NewTab(browser_); |
81 browser_->window()->Show(); | 80 browser_->window()->Show(); |
82 base::scoped_nsobject<NSNumber> numID( | 81 base::scoped_nsobject<NSNumber> numID( |
83 [[NSNumber alloc] initWithInt:browser_->session_id().id()]); | 82 [[NSNumber alloc] initWithInt:browser_->session_id().id()]); |
84 [self setUniqueID:numID]; | 83 [self setUniqueID:numID]; |
85 } | 84 } |
86 return self; | 85 return self; |
87 } | 86 } |
88 | 87 |
89 - (id)initWithBrowser:(Browser*)aBrowser { | 88 - (id)initWithBrowser:(Browser*)aBrowser { |
(...skipping 184 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
274 GURL(), EXCLUSIVE_ACCESS_BUBBLE_TYPE_FULLSCREEN_EXIT_INSTRUCTION, false); | 273 GURL(), EXCLUSIVE_ACCESS_BUBBLE_TYPE_FULLSCREEN_EXIT_INSTRUCTION, false); |
275 } | 274 } |
276 | 275 |
277 - (void)handlesExitPresentationMode:(NSScriptCommand*)command { | 276 - (void)handlesExitPresentationMode:(NSScriptCommand*)command { |
278 AppleScript::LogAppleScriptUMA( | 277 AppleScript::LogAppleScriptUMA( |
279 AppleScript::AppleScriptCommand::WINDOW_EXIT_PRESENTATION_MODE); | 278 AppleScript::AppleScriptCommand::WINDOW_EXIT_PRESENTATION_MODE); |
280 browser_->exclusive_access_manager()->context()->ExitFullscreen(); | 279 browser_->exclusive_access_manager()->context()->ExitFullscreen(); |
281 } | 280 } |
282 | 281 |
283 @end | 282 @end |
OLD | NEW |