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

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

Issue 8585031: [cros, Aura] Make screen_mode static variable in StatusAreaViewChromeos (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: merge Created 9 years, 1 month 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_dropdown.h" 5 #include "chrome/browser/ui/webui/chromeos/login/network_dropdown.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/values.h" 9 #include "base/values.h"
10 #include "chrome/browser/chromeos/cros/cros_library.h" 10 #include "chrome/browser/chromeos/cros/cros_library.h"
(...skipping 23 matching lines...) Expand all
34 // WebUI where network menu is located. 34 // WebUI where network menu is located.
35 WebUI* web_ui_; 35 WebUI* web_ui_;
36 36
37 DISALLOW_COPY_AND_ASSIGN(NetworkMenuWebUI); 37 DISALLOW_COPY_AND_ASSIGN(NetworkMenuWebUI);
38 }; 38 };
39 39
40 // NetworkMenuWebUI ------------------------------------------------------------ 40 // NetworkMenuWebUI ------------------------------------------------------------
41 41
42 NetworkMenuWebUI::NetworkMenuWebUI(NetworkMenu::Delegate* delegate, 42 NetworkMenuWebUI::NetworkMenuWebUI(NetworkMenu::Delegate* delegate,
43 WebUI* web_ui) 43 WebUI* web_ui)
44 : NetworkMenu(delegate, false), 44 : NetworkMenu(delegate),
45 web_ui_(web_ui) { 45 web_ui_(web_ui) {
46 } 46 }
47 47
48 void NetworkMenuWebUI::UpdateMenu() { 48 void NetworkMenuWebUI::UpdateMenu() {
49 NetworkMenu::UpdateMenu(); 49 NetworkMenu::UpdateMenu();
50 if (web_ui_) { 50 if (web_ui_) {
51 scoped_ptr<base::ListValue> list(ConvertMenuModel(GetMenuModel())); 51 scoped_ptr<base::ListValue> list(ConvertMenuModel(GetMenuModel()));
52 web_ui_->CallJavascriptFunction("cr.ui.DropDown.updateNetworks", *list); 52 web_ui_->CallJavascriptFunction("cr.ui.DropDown.updateNetworks", *list);
53 } 53 }
54 } 54 }
(...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after
153 std::string icon_str = 153 std::string icon_str =
154 icon_bitmap.empty() ? 154 icon_bitmap.empty() ?
155 std::string() : web_ui_util::GetImageDataUrl(icon_bitmap); 155 std::string() : web_ui_util::GetImageDataUrl(icon_bitmap);
156 base::StringValue title(text); 156 base::StringValue title(text);
157 base::StringValue icon(icon_str); 157 base::StringValue icon(icon_str);
158 web_ui_->CallJavascriptFunction("cr.ui.DropDown.updateNetworkTitle", 158 web_ui_->CallJavascriptFunction("cr.ui.DropDown.updateNetworkTitle",
159 title, icon); 159 title, icon);
160 } 160 }
161 161
162 } // namespace chromeos 162 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698