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

Side by Side Diff: chrome/browser/ui/webui/chromeos/mobile_setup_dialog.cc

Issue 10409068: Use browser::ShowWebDialog() directly in MobileSetup rather than using BrowserList. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | 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 "chrome/browser/ui/webui/chromeos/mobile_setup_dialog.h" 5 #include "chrome/browser/ui/webui/chromeos/mobile_setup_dialog.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/memory/singleton.h" 8 #include "base/memory/singleton.h"
9 #include "base/utf_string_conversions.h" 9 #include "base/utf_string_conversions.h"
10 #include "chrome/browser/platform_util.h" 10 #include "chrome/browser/platform_util.h"
11 #include "chrome/browser/ui/browser.h" 11 #include "chrome/browser/profiles/profile_manager.h"
12 #include "chrome/browser/ui/browser_dialogs.h" 12 #include "chrome/browser/ui/browser_dialogs.h"
13 #include "chrome/browser/ui/browser_list.h"
14 #include "chrome/browser/ui/webui/web_dialog_delegate.h" 13 #include "chrome/browser/ui/webui/web_dialog_delegate.h"
15 #include "chrome/common/url_constants.h" 14 #include "chrome/common/url_constants.h"
15 #include "content/public/browser/browser_thread.h"
16 #include "grit/generated_resources.h" 16 #include "grit/generated_resources.h"
17 #include "ui/base/l10n/l10n_util.h" 17 #include "ui/base/l10n/l10n_util.h"
18 #include "ui/gfx/size.h"
18 19
19 using content::BrowserThread; 20 using content::BrowserThread;
20 using content::WebContents; 21 using content::WebContents;
21 using content::WebUIMessageHandler; 22 using content::WebUIMessageHandler;
22 23
23 class MobileSetupDialogDelegate : public WebDialogDelegate { 24 class MobileSetupDialogDelegate : public WebDialogDelegate {
24 public: 25 public:
25 static MobileSetupDialogDelegate* GetInstance(); 26 static MobileSetupDialogDelegate* GetInstance();
26 void ShowDialog(); 27 void ShowDialog();
27 28
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
65 return Singleton<MobileSetupDialogDelegate>::get(); 66 return Singleton<MobileSetupDialogDelegate>::get();
66 } 67 }
67 68
68 MobileSetupDialogDelegate::MobileSetupDialogDelegate() { 69 MobileSetupDialogDelegate::MobileSetupDialogDelegate() {
69 } 70 }
70 71
71 MobileSetupDialogDelegate::~MobileSetupDialogDelegate() { 72 MobileSetupDialogDelegate::~MobileSetupDialogDelegate() {
72 } 73 }
73 74
74 void MobileSetupDialogDelegate::ShowDialog() { 75 void MobileSetupDialogDelegate::ShowDialog() {
75 Browser* browser = BrowserList::GetLastActive(); 76 browser::ShowWebDialog(NULL,
76 if (!browser) 77 ProfileManager::GetDefaultProfileOrOffTheRecord(),
77 return; 78 NULL,
78 browser->BrowserShowWebDialog(this, NULL); 79 this);
79 } 80 }
80 81
81 ui::ModalType MobileSetupDialogDelegate::GetDialogModalType() const { 82 ui::ModalType MobileSetupDialogDelegate::GetDialogModalType() const {
82 return ui::MODAL_TYPE_SYSTEM; 83 return ui::MODAL_TYPE_SYSTEM;
83 } 84 }
84 85
85 string16 MobileSetupDialogDelegate::GetDialogTitle() const { 86 string16 MobileSetupDialogDelegate::GetDialogTitle() const {
86 return l10n_util::GetStringUTF16(IDS_MOBILE_SETUP_TITLE); 87 return l10n_util::GetStringUTF16(IDS_MOBILE_SETUP_TITLE);
87 } 88 }
88 89
(...skipping 26 matching lines...) Expand all
115 } 116 }
116 117
117 bool MobileSetupDialogDelegate::ShouldShowDialogTitle() const { 118 bool MobileSetupDialogDelegate::ShouldShowDialogTitle() const {
118 return true; 119 return true;
119 } 120 }
120 121
121 bool MobileSetupDialogDelegate::HandleContextMenu( 122 bool MobileSetupDialogDelegate::HandleContextMenu(
122 const content::ContextMenuParams& params) { 123 const content::ContextMenuParams& params) {
123 return true; 124 return true;
124 } 125 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698