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

Side by Side Diff: chrome/browser/chromeos/login/background_view.cc

Issue 8509027: Add status area to Aura builds. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Move status area view ids back to chromeos 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/chromeos/login/background_view.h" 5 #include "chrome/browser/chromeos/login/background_view.h"
6 6
7 #include <string> 7 #include <string>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/string16.h" 10 #include "base/string16.h"
(...skipping 224 matching lines...) Expand 10 before | Expand all | Expand 10 after
235 235
236 void BackgroundView::ChildPreferredSizeChanged(View* child) { 236 void BackgroundView::ChildPreferredSizeChanged(View* child) {
237 Layout(); 237 Layout();
238 SchedulePaint(); 238 SchedulePaint();
239 } 239 }
240 240
241 // Overridden from StatusAreaButton::Delegate: 241 // Overridden from StatusAreaButton::Delegate:
242 242
243 bool BackgroundView::ShouldExecuteStatusAreaCommand( 243 bool BackgroundView::ShouldExecuteStatusAreaCommand(
244 const views::View* button_view, int command_id) const { 244 const views::View* button_view, int command_id) const {
245 if (command_id == StatusAreaViewChromeos::SHOW_NETWORK_OPTIONS) 245 if (command_id == StatusAreaButton::Delegate::SHOW_NETWORK_OPTIONS)
246 return true; 246 return true;
247 return false; 247 return false;
248 } 248 }
249 249
250 void BackgroundView::ExecuteStatusAreaCommand( 250 void BackgroundView::ExecuteStatusAreaCommand(
251 const views::View* button_view, int command_id) { 251 const views::View* button_view, int command_id) {
252 if (command_id == StatusAreaViewChromeos::SHOW_NETWORK_OPTIONS) { 252 if (command_id == StatusAreaButton::Delegate::SHOW_NETWORK_OPTIONS) {
253 if (proxy_settings_dialog_.get() == NULL) { 253 if (proxy_settings_dialog_.get() == NULL) {
254 proxy_settings_dialog_.reset(new ProxySettingsDialog( 254 proxy_settings_dialog_.reset(new ProxySettingsDialog(
255 this, GetNativeWindow())); 255 this, GetNativeWindow()));
256 } 256 }
257 proxy_settings_dialog_->Show(); 257 proxy_settings_dialog_->Show();
258 } 258 }
259 } 259 }
260 260
261 gfx::Font BackgroundView::GetStatusAreaFont(const gfx::Font& font) const { 261 gfx::Font BackgroundView::GetStatusAreaFont(const gfx::Font& font) const {
262 return font.DeriveFont(0, gfx::Font::BOLD); 262 return font.DeriveFont(0, gfx::Font::BOLD);
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
336 #if defined(TOOLKIT_USES_GTK) 336 #if defined(TOOLKIT_USES_GTK)
337 std::vector<int> params; 337 std::vector<int> params;
338 WmIpc::instance()->SetWindowType( 338 WmIpc::instance()->SetWindowType(
339 GTK_WIDGET(GetNativeWindow()), 339 GTK_WIDGET(GetNativeWindow()),
340 WM_IPC_WINDOW_LOGIN_BACKGROUND, 340 WM_IPC_WINDOW_LOGIN_BACKGROUND,
341 &params); 341 &params);
342 #endif 342 #endif
343 } 343 }
344 344
345 } // namespace chromeos 345 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/frame/browser_view.cc ('k') | chrome/browser/chromeos/login/webui_login_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698