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

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

Issue 7329018: [cros] Fixes hanging on the OOBE's network screen. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: -debug Created 9 years, 5 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
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/memory/scoped_ptr.h" 7 #include "base/memory/scoped_ptr.h"
8 #include "base/stringprintf.h" 8 #include "base/stringprintf.h"
9 #include "base/utf_string_conversions.h" 9 #include "base/utf_string_conversions.h"
10 #include "base/values.h" 10 #include "base/values.h"
(...skipping 17 matching lines...) Expand all
28 28
29 namespace { 29 namespace {
30 30
31 // JS API callbacks names. 31 // JS API callbacks names.
32 const char kJsApiNetworkOnExit[] = "networkOnExit"; 32 const char kJsApiNetworkOnExit[] = "networkOnExit";
33 const char kJsApiNetworkOnLanguageChanged[] = "networkOnLanguageChanged"; 33 const char kJsApiNetworkOnLanguageChanged[] = "networkOnLanguageChanged";
34 const char kJsApiNetworkOnInputMethodChanged[] = "networkOnInputMethodChanged"; 34 const char kJsApiNetworkOnInputMethodChanged[] = "networkOnInputMethodChanged";
35 const char kJsApiNetworkControlPosition[] = "networkControlPosition"; 35 const char kJsApiNetworkControlPosition[] = "networkControlPosition";
36 36
37 // Width/height of the network control window. 37 // Width/height of the network control window.
38 const int kNetworkControlWidth = 150; 38 const int kNetworkControlWidth = 250;
39 const int kNetworkControlHeight = 25; 39 const int kNetworkControlHeight = 25;
40 40
41 // Offsets for the network dropdown control menu. 41 // Offsets for the network dropdown control menu.
42 const int kMenuHorizontalOffset = -3; 42 const int kMenuHorizontalOffset = -3;
43 const int kMenuVerticalOffset = -1; 43 const int kMenuVerticalOffset = -1;
44 44
45 // Initializes menu button default properties. 45 // Initializes menu button default properties.
46 static void InitMenuButtonProperties(views::MenuButton* menu_button) { 46 static void InitMenuButtonProperties(views::MenuButton* menu_button) {
47 menu_button->set_focusable(true); 47 menu_button->set_focusable(true);
48 menu_button->SetEnabledColor(SK_ColorBLACK); 48 menu_button->SetEnabledColor(SK_ColorBLACK);
(...skipping 240 matching lines...) Expand 10 before | Expand all | Expand 10 after
289 } 289 }
290 } 290 }
291 291
292 void NetworkScreenHandler::CloseNetworkWindow() { 292 void NetworkScreenHandler::CloseNetworkWindow() {
293 if (network_window_) 293 if (network_window_)
294 network_window_->Close(); 294 network_window_->Close();
295 network_window_ = NULL; 295 network_window_ = NULL;
296 } 296 }
297 297
298 } // namespace chromeos 298 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/resources/chromeos/oobe.js ('k') | chrome/browser/ui/webui/chromeos/login/oobe_ui.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698