| 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/one_click_signin_view_controller.h" | 5 #import "chrome/browser/ui/cocoa/one_click_signin_view_controller.h" |
| 6 | 6 |
| 7 #include "base/callback_helpers.h" | 7 #include "base/callback_helpers.h" |
| 8 #include "base/logging.h" | 8 #include "base/logging.h" |
| 9 #include "base/mac/bundle_locations.h" | 9 #include "base/mac/bundle_locations.h" |
| 10 #import "chrome/browser/ui/chrome_style.h" | 10 #import "chrome/browser/ui/chrome_style.h" |
| 11 #import "chrome/browser/ui/cocoa/hyperlink_text_view.h" | 11 #import "chrome/browser/ui/cocoa/hyperlink_text_view.h" |
| 12 #include "chrome/browser/ui/sync/one_click_signin_helper.h" | 12 #include "chrome/browser/ui/sync/one_click_signin_helper.h" |
| 13 #include "chrome/browser/ui/sync/one_click_signin_histogram.h" | 13 #include "chrome/browser/ui/sync/one_click_signin_histogram.h" |
| 14 #include "chrome/common/url_constants.h" | 14 #include "chrome/common/url_constants.h" |
| 15 #include "chrome/grit/chromium_strings.h" |
| 16 #include "chrome/grit/generated_resources.h" |
| 15 #include "content/public/browser/web_contents.h" | 17 #include "content/public/browser/web_contents.h" |
| 16 #include "grit/chromium_strings.h" | |
| 17 #include "grit/generated_resources.h" | |
| 18 #include "skia/ext/skia_utils_mac.h" | 18 #include "skia/ext/skia_utils_mac.h" |
| 19 #import "third_party/google_toolbox_for_mac/src/AppKit/GTMUILocalizerAndLayoutTw
eaker.h" | 19 #import "third_party/google_toolbox_for_mac/src/AppKit/GTMUILocalizerAndLayoutTw
eaker.h" |
| 20 #include "ui/base/l10n/l10n_util_mac.h" | 20 #include "ui/base/l10n/l10n_util_mac.h" |
| 21 | 21 |
| 22 namespace { | 22 namespace { |
| 23 | 23 |
| 24 // The margin between the top edge of the border and the error message text in | 24 // The margin between the top edge of the border and the error message text in |
| 25 // the sign-in bubble, in the case of an error. | 25 // the sign-in bubble, in the case of an error. |
| 26 const CGFloat kTopErrorMessageMargin = 12; | 26 const CGFloat kTopErrorMessageMargin = 12; |
| 27 | 27 |
| (...skipping 266 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 294 content::PAGE_TRANSITION_LINK, false); | 294 content::PAGE_TRANSITION_LINK, false); |
| 295 webContents_->OpenURL(params); | 295 webContents_->OpenURL(params); |
| 296 return YES; | 296 return YES; |
| 297 } | 297 } |
| 298 | 298 |
| 299 - (void)close { | 299 - (void)close { |
| 300 base::ResetAndReturn(&closeCallback_).Run(); | 300 base::ResetAndReturn(&closeCallback_).Run(); |
| 301 } | 301 } |
| 302 | 302 |
| 303 @end | 303 @end |
| OLD | NEW |