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

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

Issue 7657022: [ChromeOS] Fix a WebUI login crash. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 4 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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/login/network_screen_handler.h" 5 #include "chrome/browser/ui/webui/chromeos/login/network_screen_handler.h"
6 6
7 #include "base/stringprintf.h" 7 #include "base/stringprintf.h"
8 #include "base/utf_string_conversions.h" 8 #include "base/utf_string_conversions.h"
9 #include "base/values.h" 9 #include "base/values.h"
10 #include "chrome/browser/browser_process.h" 10 #include "chrome/browser/browser_process.h"
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
44 44
45 // NetworkScreenHandler, public: ----------------------------------------------- 45 // NetworkScreenHandler, public: -----------------------------------------------
46 46
47 NetworkScreenHandler::NetworkScreenHandler() 47 NetworkScreenHandler::NetworkScreenHandler()
48 : screen_(NULL), 48 : screen_(NULL),
49 is_continue_enabled_(false), 49 is_continue_enabled_(false),
50 show_on_init_(false) { 50 show_on_init_(false) {
51 } 51 }
52 52
53 NetworkScreenHandler::~NetworkScreenHandler() { 53 NetworkScreenHandler::~NetworkScreenHandler() {
54 ClearErrors();
55 } 54 }
56 55
57 // NetworkScreenHandler, NetworkScreenActor implementation: -------------------- 56 // NetworkScreenHandler, NetworkScreenActor implementation: --------------------
58 57
59 void NetworkScreenHandler::SetDelegate(NetworkScreenActor::Delegate* screen) { 58 void NetworkScreenHandler::SetDelegate(NetworkScreenActor::Delegate* screen) {
60 screen_ = screen; 59 screen_ = screen;
61 } 60 }
62 61
63 void NetworkScreenHandler::PrepareToShow() { 62 void NetworkScreenHandler::PrepareToShow() {
64 } 63 }
(...skipping 177 matching lines...) Expand 10 before | Expand all | Expand 10 after
242 input_method->SetString("title", 241 input_method->SetString("title",
243 WideToUTF16(InputMethodMenu::GetTextForMenu(input_methods->at(i)))); 242 WideToUTF16(InputMethodMenu::GetTextForMenu(input_methods->at(i))));
244 input_method->SetBoolean("selected", 243 input_method->SetBoolean("selected",
245 input_methods->at(i).id() == current_input_method_id); 244 input_methods->at(i).id() == current_input_method_id);
246 input_methods_list->Append(input_method); 245 input_methods_list->Append(input_method);
247 } 246 }
248 return input_methods_list; 247 return input_methods_list;
249 } 248 }
250 249
251 } // namespace chromeos 250 } // namespace chromeos
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