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

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

Issue 8598031: views: Move widget/ directory to ui/views. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: reland for real 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/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 #include <vector> 9 #include <vector>
10 10
(...skipping 13 matching lines...) Expand all
24 #include "chrome/browser/chromeos/view_ids.h" 24 #include "chrome/browser/chromeos/view_ids.h"
25 #include "chrome/browser/prefs/pref_service.h" 25 #include "chrome/browser/prefs/pref_service.h"
26 #include "chrome/browser/profiles/profile.h" 26 #include "chrome/browser/profiles/profile.h"
27 #include "chrome/browser/ui/browser.h" 27 #include "chrome/browser/ui/browser.h"
28 #include "chrome/browser/ui/browser_list.h" 28 #include "chrome/browser/ui/browser_list.h"
29 #include "chrome/common/pref_names.h" 29 #include "chrome/common/pref_names.h"
30 #include "grit/generated_resources.h" 30 #include "grit/generated_resources.h"
31 #include "grit/theme_resources.h" 31 #include "grit/theme_resources.h"
32 #include "ui/base/l10n/l10n_util.h" 32 #include "ui/base/l10n/l10n_util.h"
33 #include "ui/base/resource/resource_bundle.h" 33 #include "ui/base/resource/resource_bundle.h"
34 #include "views/widget/widget.h" 34 #include "ui/views/widget/widget.h"
35 35
36 namespace { 36 namespace {
37 37
38 // Time in milliseconds to delay showing of promo 38 // Time in milliseconds to delay showing of promo
39 // notification when Chrome window is not on screen. 39 // notification when Chrome window is not on screen.
40 const int kPromoShowDelayMs = 10000; 40 const int kPromoShowDelayMs = 10000;
41 41
42 const int kNotificationCountPrefDefault = -1; 42 const int kNotificationCountPrefDefault = -1;
43 43
44 bool GetBooleanPref(const char* pref_name) { 44 bool GetBooleanPref(const char* pref_name) {
(...skipping 404 matching lines...) Expand 10 before | Expand all | Expand 10 after
449 SetCarrierDealPromoShown(carrier_deal_promo_pref + 1); 449 SetCarrierDealPromoShown(carrier_deal_promo_pref + 1);
450 } 450 }
451 } 451 }
452 452
453 void NetworkMenuButton::SetTooltipAndAccessibleName(const string16& label) { 453 void NetworkMenuButton::SetTooltipAndAccessibleName(const string16& label) {
454 SetTooltipText(label); 454 SetTooltipText(label);
455 SetAccessibleName(label); 455 SetAccessibleName(label);
456 } 456 }
457 457
458 } // namespace chromeos 458 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/status/network_menu.cc ('k') | chrome/browser/chromeos/status/power_menu_button.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698