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

Side by Side Diff: chrome/browser/ui/views/ash/launcher/chrome_launcher_controller_browsertest.cc

Issue 10824204: Move small c/b/extensions classes into extensions namespace no.2 (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Created 8 years, 4 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/ash/launcher/chrome_launcher_controller.h" 5 #include "chrome/browser/ui/views/ash/launcher/chrome_launcher_controller.h"
6 6
7 #include "ash/launcher/launcher.h" 7 #include "ash/launcher/launcher.h"
8 #include "ash/launcher/launcher_model.h" 8 #include "ash/launcher/launcher_model.h"
9 #include "ash/shell.h" 9 #include "ash/shell.h"
10 #include "ash/wm/window_util.h" 10 #include "ash/wm/window_util.h"
(...skipping 20 matching lines...) Expand all
31 #include "chrome/test/base/ui_test_utils.h" 31 #include "chrome/test/base/ui_test_utils.h"
32 #include "content/public/browser/notification_service.h" 32 #include "content/public/browser/notification_service.h"
33 #include "content/public/browser/notification_source.h" 33 #include "content/public/browser/notification_source.h"
34 #include "content/public/browser/web_contents.h" 34 #include "content/public/browser/web_contents.h"
35 #include "testing/gtest/include/gtest/gtest.h" 35 #include "testing/gtest/include/gtest/gtest.h"
36 #include "ui/aura/window.h" 36 #include "ui/aura/window.h"
37 37
38 using extensions::Extension; 38 using extensions::Extension;
39 using content::WebContents; 39 using content::WebContents;
40 40
41 typedef PlatformAppBrowserTest LauncherPlatformAppBrowserTest; 41 typedef extensions::PlatformAppBrowserTest LauncherPlatformAppBrowserTest;
42 42
43 class LauncherAppBrowserTest : public ExtensionBrowserTest { 43 class LauncherAppBrowserTest : public ExtensionBrowserTest {
44 protected: 44 protected:
45 LauncherAppBrowserTest() 45 LauncherAppBrowserTest()
46 : launcher_(NULL), 46 : launcher_(NULL),
47 model_(NULL) { 47 model_(NULL) {
48 } 48 }
49 49
50 virtual ~LauncherAppBrowserTest() {} 50 virtual ~LauncherAppBrowserTest() {}
51 51
(...skipping 531 matching lines...) Expand 10 before | Expand all | Expand 10 after
583 // Navigate away. 583 // Navigate away.
584 ui_test_utils::NavigateToURL( 584 ui_test_utils::NavigateToURL(
585 browser(), GURL("http://www.example.com/path0/bar.html")); 585 browser(), GURL("http://www.example.com/path0/bar.html"));
586 EXPECT_EQ(ash::STATUS_CLOSED, (*model_->ItemByID(shortcut_id)).status); 586 EXPECT_EQ(ash::STATUS_CLOSED, (*model_->ItemByID(shortcut_id)).status);
587 587
588 // Navigate back. 588 // Navigate back.
589 ui_test_utils::NavigateToURL( 589 ui_test_utils::NavigateToURL(
590 browser(), GURL("http://www.example.com/path1/foo.html")); 590 browser(), GURL("http://www.example.com/path1/foo.html"));
591 EXPECT_EQ(ash::STATUS_ACTIVE, (*model_->ItemByID(shortcut_id)).status); 591 EXPECT_EQ(ash::STATUS_ACTIVE, (*model_->ItemByID(shortcut_id)).status);
592 } 592 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698