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

Side by Side Diff: chrome/browser/ui/cocoa/tab_dialogs_cocoa.mm

Issue 2847173004: Switch SupportsUserData uses to use unique_ptr. (Closed)
Patch Set: Created 3 years, 7 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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/cocoa/tab_dialogs_cocoa.h" 5 #include "chrome/browser/ui/cocoa/tab_dialogs_cocoa.h"
6 6
7 #include "base/memory/ptr_util.h" 7 #include "base/memory/ptr_util.h"
8 #import "chrome/browser/ui/cocoa/content_settings/collected_cookies_mac.h" 8 #import "chrome/browser/ui/cocoa/content_settings/collected_cookies_mac.h"
9 #import "chrome/browser/ui/cocoa/hung_renderer_controller.h" 9 #import "chrome/browser/ui/cocoa/hung_renderer_controller.h"
10 #import "chrome/browser/ui/cocoa/passwords/passwords_bubble_cocoa.h" 10 #import "chrome/browser/ui/cocoa/passwords/passwords_bubble_cocoa.h"
11 #import "chrome/browser/ui/cocoa/profiles/profile_signin_confirmation_dialog_coc oa.h" 11 #import "chrome/browser/ui/cocoa/profiles/profile_signin_confirmation_dialog_coc oa.h"
12 #include "chrome/browser/ui/cocoa/tab_dialogs_views_mac.h" 12 #include "chrome/browser/ui/cocoa/tab_dialogs_views_mac.h"
13 #import "chrome/browser/ui/cocoa/validation_message_bubble_cocoa.h" 13 #import "chrome/browser/ui/cocoa/validation_message_bubble_cocoa.h"
14 #include "chrome/browser/ui/sync/profile_signin_confirmation_helper.h" 14 #include "chrome/browser/ui/sync/profile_signin_confirmation_helper.h"
15 #include "content/public/browser/web_contents.h" 15 #include "content/public/browser/web_contents.h"
16 #include "ui/base/material_design/material_design_controller.h" 16 #include "ui/base/material_design/material_design_controller.h"
17 17
18 // static 18 // static
19 void TabDialogs::CreateForWebContents(content::WebContents* contents) { 19 void TabDialogs::CreateForWebContents(content::WebContents* contents) {
20 DCHECK(contents); 20 DCHECK(contents);
21 21
22 if (!FromWebContents(contents)) { 22 if (!FromWebContents(contents)) {
23 TabDialogs* tab_dialogs = 23 std::unique_ptr<TabDialogs> tab_dialogs =
24 ui::MaterialDesignController::IsSecondaryUiMaterial() 24 ui::MaterialDesignController::IsSecondaryUiMaterial()
25 ? new TabDialogsViewsMac(contents) 25 ? base::MakeUnique<TabDialogsViewsMac>(contents)
26 : new TabDialogsCocoa(contents); 26 : base::MakeUnique<TabDialogsCocoa>(contents);
27 contents->SetUserData(UserDataKey(), tab_dialogs); 27 contents->SetUserData(UserDataKey(), std::move(tab_dialogs));
28 } 28 }
29 } 29 }
30 30
31 TabDialogsCocoa::TabDialogsCocoa(content::WebContents* contents) 31 TabDialogsCocoa::TabDialogsCocoa(content::WebContents* contents)
32 : web_contents_(contents) { 32 : web_contents_(contents) {
33 DCHECK(contents); 33 DCHECK(contents);
34 } 34 }
35 35
36 TabDialogsCocoa::~TabDialogsCocoa() { 36 TabDialogsCocoa::~TabDialogsCocoa() {
37 } 37 }
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
78 // The bubble is closed when it loses the focus. 78 // The bubble is closed when it loses the focus.
79 } 79 }
80 80
81 base::WeakPtr<ValidationMessageBubble> TabDialogsCocoa::ShowValidationMessage( 81 base::WeakPtr<ValidationMessageBubble> TabDialogsCocoa::ShowValidationMessage(
82 const gfx::Rect& anchor_in_root_view, 82 const gfx::Rect& anchor_in_root_view,
83 const base::string16& main_text, 83 const base::string16& main_text,
84 const base::string16& sub_text) { 84 const base::string16& sub_text) {
85 return (new ValidationMessageBubbleCocoa( 85 return (new ValidationMessageBubbleCocoa(
86 web_contents_, anchor_in_root_view, main_text, sub_text))->AsWeakPtr(); 86 web_contents_, anchor_in_root_view, main_text, sub_text))->AsWeakPtr();
87 } 87 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698