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

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

Issue 1109043003: Apply automated fixits for Chrome clang plugin to chrome. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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_win.h" 5 #include "chrome/browser/ui/views/status_icons/status_tray_win.h"
6 6
7 #include <commctrl.h> 7 #include <commctrl.h>
8 8
9 #include "base/strings/string_util.h" 9 #include "base/strings/string_util.h"
10 #include "base/strings/utf_string_conversions.h" 10 #include "base/strings/utf_string_conversions.h"
11 #include "chrome/browser/status_icons/status_icon_menu_model.h" 11 #include "chrome/browser/status_icons/status_icon_menu_model.h"
12 #include "chrome/browser/status_icons/status_icon_observer.h" 12 #include "chrome/browser/status_icons/status_icon_observer.h"
13 #include "chrome/browser/ui/views/status_icons/status_icon_win.h" 13 #include "chrome/browser/ui/views/status_icons/status_icon_win.h"
14 #include "grit/chrome_unscaled_resources.h" 14 #include "grit/chrome_unscaled_resources.h"
15 #include "testing/gtest/include/gtest/gtest.h" 15 #include "testing/gtest/include/gtest/gtest.h"
16 #include "ui/base/resource/resource_bundle.h" 16 #include "ui/base/resource/resource_bundle.h"
17 #include "ui/gfx/image/image_skia.h" 17 #include "ui/gfx/image/image_skia.h"
18 18
19 class FakeStatusTrayStateChangerProxy : public StatusTrayStateChangerProxy { 19 class FakeStatusTrayStateChangerProxy : public StatusTrayStateChangerProxy {
20 public: 20 public:
21 FakeStatusTrayStateChangerProxy() 21 FakeStatusTrayStateChangerProxy()
22 : enqueue_called_(false), icon_id_(0), window_(NULL) {} 22 : enqueue_called_(false), icon_id_(0), window_(NULL) {}
23 23
24 virtual void EnqueueChange(UINT icon_id, HWND window) { 24 void EnqueueChange(UINT icon_id, HWND window) override {
25 enqueue_called_ = true; 25 enqueue_called_ = true;
26 icon_id_ = icon_id; 26 icon_id_ = icon_id;
27 window_ = window; 27 window_ = window;
28 } 28 }
29 29
30 bool enqueue_called() { return enqueue_called_; } 30 bool enqueue_called() { return enqueue_called_; }
31 UINT icon_id() { return icon_id_; } 31 UINT icon_id() { return icon_id_; }
32 HWND window() { return window_; } 32 HWND window() { return window_; }
33 33
34 private: 34 private:
35 bool enqueue_called_; 35 bool enqueue_called_;
36 UINT icon_id_; 36 UINT icon_id_;
37 HWND window_; 37 HWND window_;
38 38
39 DISALLOW_COPY_AND_ASSIGN(FakeStatusTrayStateChangerProxy); 39 DISALLOW_COPY_AND_ASSIGN(FakeStatusTrayStateChangerProxy);
40 }; 40 };
41 41
42 class FakeStatusIconObserver : public StatusIconObserver { 42 class FakeStatusIconObserver : public StatusIconObserver {
43 public: 43 public:
44 FakeStatusIconObserver() 44 FakeStatusIconObserver()
45 : balloon_clicked_(false), 45 : balloon_clicked_(false),
46 status_icon_click_count_(0) {} 46 status_icon_click_count_(0) {}
47 virtual void OnStatusIconClicked() { 47 void OnStatusIconClicked() override { ++status_icon_click_count_; }
48 ++status_icon_click_count_; 48 void OnBalloonClicked() override { balloon_clicked_ = true; }
49 }
50 virtual void OnBalloonClicked() { balloon_clicked_ = true; }
51 bool balloon_clicked() const { return balloon_clicked_; } 49 bool balloon_clicked() const { return balloon_clicked_; }
52 size_t status_icon_click_count() const { 50 size_t status_icon_click_count() const {
53 return status_icon_click_count_; 51 return status_icon_click_count_;
54 } 52 }
55 53
56 private: 54 private:
57 size_t status_icon_click_count_; 55 size_t status_icon_click_count_;
58 bool balloon_clicked_; 56 bool balloon_clicked_;
59 }; 57 };
60 58
(...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after
140 StatusIconWin* icon = static_cast<StatusIconWin*>(tray.CreateStatusIcon( 138 StatusIconWin* icon = static_cast<StatusIconWin*>(tray.CreateStatusIcon(
141 StatusTray::OTHER_ICON, *image, base::ASCIIToUTF16("tool tip"))); 139 StatusTray::OTHER_ICON, *image, base::ASCIIToUTF16("tool tip")));
142 140
143 icon->ForceVisible(); 141 icon->ForceVisible();
144 // |proxy| is owned by |tray|, and |tray| lives to the end of the scope, 142 // |proxy| is owned by |tray|, and |tray| lives to the end of the scope,
145 // so calling methods on |proxy| is safe. 143 // so calling methods on |proxy| is safe.
146 EXPECT_TRUE(proxy->enqueue_called()); 144 EXPECT_TRUE(proxy->enqueue_called());
147 EXPECT_EQ(proxy->window(), icon->window()); 145 EXPECT_EQ(proxy->window(), icon->window());
148 EXPECT_EQ(proxy->icon_id(), icon->icon_id()); 146 EXPECT_EQ(proxy->icon_id(), icon->icon_id());
149 } 147 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698