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

Side by Side Diff: chrome/browser/ui/views/status_icons/status_tray_linux.cc

Issue 1545153002: Switch to standard integer types in chrome/browser/ui/views/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 12 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
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/views/status_icons/status_tray_linux.h" 5 #include "chrome/browser/ui/views/status_icons/status_tray_linux.h"
6 6
7 #include "build/build_config.h"
8
7 #if !defined(OS_CHROMEOS) 9 #if !defined(OS_CHROMEOS)
8 #include "chrome/browser/ui/views/status_icons/status_icon_linux_wrapper.h" 10 #include "chrome/browser/ui/views/status_icons/status_icon_linux_wrapper.h"
9 #include "ui/views/linux_ui/linux_ui.h" 11 #include "ui/views/linux_ui/linux_ui.h"
10 12
11 StatusTrayLinux::StatusTrayLinux() { 13 StatusTrayLinux::StatusTrayLinux() {
12 } 14 }
13 15
14 StatusTrayLinux::~StatusTrayLinux() { 16 StatusTrayLinux::~StatusTrayLinux() {
15 } 17 }
16 18
(...skipping 10 matching lines...) Expand all
27 // Only create a status tray if we can actually create status icons. 29 // Only create a status tray if we can actually create status icons.
28 if (linux_ui && linux_ui->IsStatusIconSupported()) 30 if (linux_ui && linux_ui->IsStatusIconSupported())
29 return new StatusTrayLinux(); 31 return new StatusTrayLinux();
30 return NULL; 32 return NULL;
31 } 33 }
32 #else // defined(OS_CHROMEOS) 34 #else // defined(OS_CHROMEOS)
33 StatusTray* StatusTray::Create() { 35 StatusTray* StatusTray::Create() {
34 return NULL; 36 return NULL;
35 } 37 }
36 #endif 38 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698