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

Side by Side Diff: chrome/browser/chromeos/status/network_menu_button.cc

Issue 6904160: Implement new gray mock. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Review nits Created 9 years, 7 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/chromeos/status/network_menu_button.h" 5 #include "chrome/browser/chromeos/status/network_menu_button.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <limits> 8 #include <limits>
9 9
10 #include "base/logging.h" 10 #include "base/logging.h"
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
65 65
66 namespace chromeos { 66 namespace chromeos {
67 67
68 //////////////////////////////////////////////////////////////////////////////// 68 ////////////////////////////////////////////////////////////////////////////////
69 // NetworkMenuButton 69 // NetworkMenuButton
70 70
71 // static 71 // static
72 const int NetworkMenuButton::kThrobDuration = 1000; 72 const int NetworkMenuButton::kThrobDuration = 1000;
73 73
74 NetworkMenuButton::NetworkMenuButton(StatusAreaHost* host) 74 NetworkMenuButton::NetworkMenuButton(StatusAreaHost* host)
75 : StatusAreaButton(this), 75 : StatusAreaButton(host, this),
76 NetworkMenu(), 76 NetworkMenu(),
77 host_(host),
78 icon_(NULL), 77 icon_(NULL),
79 right_badge_(NULL), 78 right_badge_(NULL),
80 left_badge_(NULL), 79 left_badge_(NULL),
81 mobile_data_bubble_(NULL), 80 mobile_data_bubble_(NULL),
82 ALLOW_THIS_IN_INITIALIZER_LIST(animation_connecting_(this)), 81 ALLOW_THIS_IN_INITIALIZER_LIST(animation_connecting_(this)),
83 ALLOW_THIS_IN_INITIALIZER_LIST(method_factory_(this)) { 82 ALLOW_THIS_IN_INITIALIZER_LIST(method_factory_(this)) {
84 animation_connecting_.SetThrobDuration(kThrobDuration); 83 animation_connecting_.SetThrobDuration(kThrobDuration);
85 animation_connecting_.SetTweenType(ui::Tween::EASE_IN_OUT); 84 animation_connecting_.SetTweenType(ui::Tween::EASE_IN_OUT);
86 NetworkLibrary* network_library = CrosLibrary::Get()->GetNetworkLibrary(); 85 NetworkLibrary* network_library = CrosLibrary::Get()->GetNetworkLibrary();
87 OnNetworkManagerChanged(network_library); 86 OnNetworkManagerChanged(network_library);
(...skipping 283 matching lines...) Expand 10 before | Expand all | Expand 10 after
371 BubbleBorder::TOP_RIGHT , 370 BubbleBorder::TOP_RIGHT ,
372 ResourceBundle::GetSharedInstance().GetBitmapNamed(IDR_NOTIFICATION_3G), 371 ResourceBundle::GetSharedInstance().GetBitmapNamed(IDR_NOTIFICATION_3G),
373 UTF16ToWide(l10n_util::GetStringUTF16(IDS_3G_NOTIFICATION_MESSAGE)), 372 UTF16ToWide(l10n_util::GetStringUTF16(IDS_3G_NOTIFICATION_MESSAGE)),
374 UTF16ToWide(l10n_util::GetStringUTF16(IDS_OFFLINE_NETWORK_SETTINGS)), 373 UTF16ToWide(l10n_util::GetStringUTF16(IDS_OFFLINE_NETWORK_SETTINGS)),
375 this); 374 this);
376 SetShow3gPromoNotification(false); 375 SetShow3gPromoNotification(false);
377 } 376 }
378 } 377 }
379 378
380 } // namespace chromeos 379 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/status/network_menu_button.h ('k') | chrome/browser/chromeos/status/power_menu_button.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698