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

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

Issue 2135005: Integrated new bug icon in status bar (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 10 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
« no previous file with comments | « chrome/browser/chromeos/status/status_area_view.h ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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/status_area_view.h" 5 #include "chrome/browser/chromeos/status/status_area_view.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "chrome/browser/chromeos/status/clock_menu_button.h" 9 #include "chrome/browser/chromeos/status/clock_menu_button.h"
10 #include "chrome/browser/chromeos/status/feedback_menu_button.h"
10 #include "chrome/browser/chromeos/status/language_menu_button.h" 11 #include "chrome/browser/chromeos/status/language_menu_button.h"
11 #include "chrome/browser/chromeos/status/network_menu_button.h" 12 #include "chrome/browser/chromeos/status/network_menu_button.h"
12 #include "chrome/browser/chromeos/status/power_menu_button.h" 13 #include "chrome/browser/chromeos/status/power_menu_button.h"
13 #include "chrome/browser/chromeos/status/status_area_host.h" 14 #include "chrome/browser/chromeos/status/status_area_host.h"
14 #include "gfx/canvas.h" 15 #include "gfx/canvas.h"
15 16
16 namespace chromeos { 17 namespace chromeos {
17 18
18 // Number of pixels to separate each icon. 19 // Number of pixels to separate each icon.
19 const int kSeparation = 6; 20 const int kSeparation = 6;
20 21
21 // BrowserWindowGtk tiles its image with this offset 22 // BrowserWindowGtk tiles its image with this offset
22 const int kCustomFrameBackgroundVerticalOffset = 15; 23 const int kCustomFrameBackgroundVerticalOffset = 15;
23 24
24 // Default to opening new tabs on the left. 25 // Default to opening new tabs on the left.
25 StatusAreaView::OpenTabsMode StatusAreaView::open_tabs_mode_ = 26 StatusAreaView::OpenTabsMode StatusAreaView::open_tabs_mode_ =
26 StatusAreaView::OPEN_TABS_ON_LEFT; 27 StatusAreaView::OPEN_TABS_ON_LEFT;
27 28
28 StatusAreaView::StatusAreaView(StatusAreaHost* host) 29 StatusAreaView::StatusAreaView(StatusAreaHost* host)
29 : host_(host), 30 : host_(host),
30 clock_view_(NULL), 31 clock_view_(NULL),
32 feedback_view_(NULL),
31 language_view_(NULL), 33 language_view_(NULL),
32 network_view_(NULL), 34 network_view_(NULL),
33 power_view_(NULL) { 35 power_view_(NULL) {
34 } 36 }
35 37
36 void StatusAreaView::Init() { 38 void StatusAreaView::Init() {
37 // Language. 39 // Language.
38 language_view_ = new LanguageMenuButton(host_); 40 language_view_ = new LanguageMenuButton(host_);
39 AddChildView(language_view_); 41 AddChildView(language_view_);
40 42
43 // Feedback.
44 feedback_view_ = new FeedbackMenuButton(host_);
45 AddChildView(feedback_view_);
46
41 // Network. 47 // Network.
42 network_view_ = new NetworkMenuButton(host_); 48 network_view_ = new NetworkMenuButton(host_);
43 AddChildView(network_view_); 49 AddChildView(network_view_);
44 50
45 // Power. 51 // Power.
46 power_view_ = new PowerMenuButton(); 52 power_view_ = new PowerMenuButton();
47 AddChildView(power_view_); 53 AddChildView(power_view_);
48 54
49 // Clock. 55 // Clock.
50 clock_view_ = new ClockMenuButton(host_); 56 clock_view_ = new ClockMenuButton(host_);
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
105 StatusAreaView::OpenTabsMode StatusAreaView::GetOpenTabsMode() { 111 StatusAreaView::OpenTabsMode StatusAreaView::GetOpenTabsMode() {
106 return open_tabs_mode_; 112 return open_tabs_mode_;
107 } 113 }
108 114
109 // static 115 // static
110 void StatusAreaView::SetOpenTabsMode(OpenTabsMode mode) { 116 void StatusAreaView::SetOpenTabsMode(OpenTabsMode mode) {
111 open_tabs_mode_ = mode; 117 open_tabs_mode_ = mode;
112 } 118 }
113 119
114 } // namespace chromeos 120 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/status/status_area_view.h ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698