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

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

Issue 15949029: Use a direct include of utf_string_conversions.h in chrome/browser/ui/, part 2. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 7 years, 6 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) 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 "base/string_util.h" 7 #include "base/string_util.h"
8 #include "base/utf_string_conversions.h" 8 #include "base/strings/utf_string_conversions.h"
9 #include "chrome/browser/status_icons/status_icon_observer.h" 9 #include "chrome/browser/status_icons/status_icon_observer.h"
10 #include "chrome/browser/ui/views/status_icons/status_icon_win.h" 10 #include "chrome/browser/ui/views/status_icons/status_icon_win.h"
11 #include "grit/chrome_unscaled_resources.h" 11 #include "grit/chrome_unscaled_resources.h"
12 #include "testing/gmock/include/gmock/gmock.h" 12 #include "testing/gmock/include/gmock/gmock.h"
13 #include "testing/gtest/include/gtest/gtest.h" 13 #include "testing/gtest/include/gtest/gtest.h"
14 #include "ui/base/models/simple_menu_model.h" 14 #include "ui/base/models/simple_menu_model.h"
15 #include "ui/base/resource/resource_bundle.h" 15 #include "ui/base/resource/resource_bundle.h"
16 16
17 class SkBitmap; 17 class SkBitmap;
18 18
(...skipping 30 matching lines...) Expand all
49 MockStatusIconObserver observer; 49 MockStatusIconObserver observer;
50 icon->AddObserver(&observer); 50 icon->AddObserver(&observer);
51 EXPECT_CALL(observer, OnStatusIconClicked()); 51 EXPECT_CALL(observer, OnStatusIconClicked());
52 // Mimic a click. 52 // Mimic a click.
53 tray.WndProc(NULL, icon->message_id(), icon->icon_id(), WM_LBUTTONDOWN); 53 tray.WndProc(NULL, icon->message_id(), icon->icon_id(), WM_LBUTTONDOWN);
54 // Mimic a right-click - observer should not be called. 54 // Mimic a right-click - observer should not be called.
55 tray.WndProc(NULL, icon->message_id(), icon->icon_id(), WM_RBUTTONDOWN); 55 tray.WndProc(NULL, icon->message_id(), icon->icon_id(), WM_RBUTTONDOWN);
56 icon->RemoveObserver(&observer); 56 icon->RemoveObserver(&observer);
57 } 57 }
58 #endif // !defined(USE_AURA) 58 #endif // !defined(USE_AURA)
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698