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

Side by Side Diff: chrome/browser/notifications/notification_browsertest.cc

Issue 12036003: Move window_open_disposition.h from webkit/ into ui/base. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix win Created 7 years, 11 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 <deque> 5 #include <deque>
6 #include <string> 6 #include <string>
7 7
8 #include "base/bind.h" 8 #include "base/bind.h"
9 #include "base/callback.h" 9 #include "base/callback.h"
10 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.h"
(...skipping 25 matching lines...) Expand all
36 #include "content/public/browser/notification_source.h" 36 #include "content/public/browser/notification_source.h"
37 #include "content/public/browser/notification_types.h" 37 #include "content/public/browser/notification_types.h"
38 #include "content/public/browser/render_view_host.h" 38 #include "content/public/browser/render_view_host.h"
39 #include "content/public/browser/web_contents.h" 39 #include "content/public/browser/web_contents.h"
40 #include "content/public/test/browser_test_utils.h" 40 #include "content/public/test/browser_test_utils.h"
41 #include "content/public/test/test_utils.h" 41 #include "content/public/test/test_utils.h"
42 #include "googleurl/src/gurl.h" 42 #include "googleurl/src/gurl.h"
43 #include "net/base/net_util.h" 43 #include "net/base/net_util.h"
44 #include "net/test/test_server.h" 44 #include "net/test/test_server.h"
45 #include "testing/gtest/include/gtest/gtest.h" 45 #include "testing/gtest/include/gtest/gtest.h"
46 #include "webkit/glue/window_open_disposition.h" 46 #include "ui/base/window_open_disposition.h"
47 47
48 namespace { 48 namespace {
49 49
50 const char kExpectedIconUrl[] = "files/notifications/no_such_file.png"; 50 const char kExpectedIconUrl[] = "files/notifications/no_such_file.png";
51 51
52 enum InfobarAction { 52 enum InfobarAction {
53 DISMISS = 0, 53 DISMISS = 0,
54 ALLOW, 54 ALLOW,
55 DENY, 55 DENY,
56 }; 56 };
(...skipping 733 matching lines...) Expand 10 before | Expand all | Expand 10 after
790 const std::deque<Balloon*>& balloons = GetActiveBalloons(); 790 const std::deque<Balloon*>& balloons = GetActiveBalloons();
791 EXPECT_EQ(1U, balloons.size()); 791 EXPECT_EQ(1U, balloons.size());
792 const Notification& notification = balloons[0]->notification(); 792 const Notification& notification = balloons[0]->notification();
793 GURL EXPECTED_ICON_URL = test_server()->GetURL(kExpectedIconUrl); 793 GURL EXPECTED_ICON_URL = test_server()->GetURL(kExpectedIconUrl);
794 EXPECT_EQ(EXPECTED_ICON_URL, notification.icon_url()); 794 EXPECT_EQ(EXPECTED_ICON_URL, notification.icon_url());
795 EXPECT_EQ(ASCIIToUTF16("Title2"), notification.title()); 795 EXPECT_EQ(ASCIIToUTF16("Title2"), notification.title());
796 EXPECT_EQ(ASCIIToUTF16("Body2"), notification.body()); 796 EXPECT_EQ(ASCIIToUTF16("Body2"), notification.body());
797 } 797 }
798 798
799 #endif // !defined(OS_CHROMEOS) 799 #endif // !defined(OS_CHROMEOS)
OLDNEW
« no previous file with comments | « chrome/browser/metrics/metrics_service_browsertest.cc ('k') | chrome/browser/sessions/session_restore.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698