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

Side by Side Diff: chrome/browser/chromeos/sim_dialog_delegate.cc

Issue 99133022: GetDefaultProfile fixit for Chrome OS network & power settings (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years 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
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/chromeos/sim_dialog_delegate.h" 5 #include "chrome/browser/chromeos/sim_dialog_delegate.h"
6 6
7 #include "base/strings/stringprintf.h" 7 #include "base/strings/stringprintf.h"
8 #include "chrome/browser/chromeos/login/user_manager.h" 8 #include "chrome/browser/chromeos/login/user_manager.h"
9 #include "chrome/browser/profiles/profile_manager.h" 9 #include "chrome/browser/profiles/profile_manager.h"
10 #include "chrome/browser/ui/browser_dialogs.h" 10 #include "chrome/browser/ui/browser_dialogs.h"
(...skipping 27 matching lines...) Expand all
38 const char kSimDialogSetLockOffMode[] = "set-lock-off"; 38 const char kSimDialogSetLockOffMode[] = "set-lock-off";
39 39
40 } // namespace 40 } // namespace
41 41
42 namespace chromeos { 42 namespace chromeos {
43 43
44 // static 44 // static
45 void SimDialogDelegate::ShowDialog(gfx::NativeWindow owning_window, 45 void SimDialogDelegate::ShowDialog(gfx::NativeWindow owning_window,
46 SimDialogMode mode) { 46 SimDialogMode mode) {
47 chrome::ShowWebDialog(owning_window, 47 chrome::ShowWebDialog(owning_window,
48 ProfileManager::GetDefaultProfileOrOffTheRecord(), 48 ProfileManager::GetActiveUserProfileOrOffTheRecord(),
Mr4D (OOO till 08-26) 2013/12/16 18:31:31 Same as above. OrOffTheRecord is depricated and th
49 new SimDialogDelegate(mode)); 49 new SimDialogDelegate(mode));
50 } 50 }
51 51
52 SimDialogDelegate::SimDialogDelegate(SimDialogMode dialog_mode) 52 SimDialogDelegate::SimDialogDelegate(SimDialogMode dialog_mode)
53 : dialog_mode_(dialog_mode) { 53 : dialog_mode_(dialog_mode) {
54 } 54 }
55 55
56 SimDialogDelegate::~SimDialogDelegate() { 56 SimDialogDelegate::~SimDialogDelegate() {
57 } 57 }
58 58
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
111 return false; 111 return false;
112 } 112 }
113 113
114 bool SimDialogDelegate::HandleContextMenu( 114 bool SimDialogDelegate::HandleContextMenu(
115 const content::ContextMenuParams& params) { 115 const content::ContextMenuParams& params) {
116 // Disable context menu. 116 // Disable context menu.
117 return true; 117 return true;
118 } 118 }
119 119
120 } // namespace chromeos 120 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698