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

Side by Side Diff: chrome/browser/apps/app_browsertest.cc

Issue 2230203002: chrome: Use stl utilities from the base namespace (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Removed accidental components/ change Created 4 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
« no previous file with comments | « chrome/browser/app_controller_mac.mm ('k') | chrome/browser/apps/app_window_registry_util.cc » ('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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 <stddef.h> 5 #include <stddef.h>
6 6
7 #include <memory> 7 #include <memory>
8 8
9 #include "apps/launcher.h" 9 #include "apps/launcher.h"
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 1226 matching lines...) Expand 10 before | Expand all | Expand 10 after
1237 1237
1238 // Listen for new app windows so we see the file manager app launch itself. 1238 // Listen for new app windows so we see the file manager app launch itself.
1239 AppWindowRegistry* registry = AppWindowRegistry::Get(incognito_profile); 1239 AppWindowRegistry* registry = AppWindowRegistry::Get(incognito_profile);
1240 ASSERT_TRUE(registry != NULL); 1240 ASSERT_TRUE(registry != NULL);
1241 registry->AddObserver(this); 1241 registry->AddObserver(this);
1242 1242
1243 OpenApplication(CreateAppLaunchParamsUserContainer( 1243 OpenApplication(CreateAppLaunchParamsUserContainer(
1244 incognito_profile, file_manager, NEW_FOREGROUND_TAB, 1244 incognito_profile, file_manager, NEW_FOREGROUND_TAB,
1245 extensions::SOURCE_TEST)); 1245 extensions::SOURCE_TEST));
1246 1246
1247 while (!ContainsKey(opener_app_ids_, file_manager->id())) { 1247 while (!base::ContainsKey(opener_app_ids_, file_manager->id())) {
1248 content::RunAllPendingInMessageLoop(); 1248 content::RunAllPendingInMessageLoop();
1249 } 1249 }
1250 } 1250 }
1251 1251
1252 class RestartDeviceTest : public PlatformAppBrowserTest { 1252 class RestartDeviceTest : public PlatformAppBrowserTest {
1253 public: 1253 public:
1254 RestartDeviceTest() 1254 RestartDeviceTest()
1255 : power_manager_client_(NULL), 1255 : power_manager_client_(NULL),
1256 mock_user_manager_(NULL) {} 1256 mock_user_manager_(NULL) {}
1257 ~RestartDeviceTest() override {} 1257 ~RestartDeviceTest() override {}
(...skipping 124 matching lines...) Expand 10 before | Expand all | Expand 10 after
1382 // https://crbug.com/620194. 1382 // https://crbug.com/620194.
1383 #define MAYBE_AppWindowIframe DISABLED_AppWindowIframe 1383 #define MAYBE_AppWindowIframe DISABLED_AppWindowIframe
1384 // Sends chrome.test.sendMessage from chrome.app.window.create's callback. 1384 // Sends chrome.test.sendMessage from chrome.app.window.create's callback.
1385 // The app window also adds an <iframe> to the page during window.onload. 1385 // The app window also adds an <iframe> to the page during window.onload.
1386 IN_PROC_BROWSER_TEST_F(PlatformAppBrowserTest, MAYBE_AppWindowIframe) { 1386 IN_PROC_BROWSER_TEST_F(PlatformAppBrowserTest, MAYBE_AppWindowIframe) {
1387 LoadAndLaunchPlatformApp("app_window_send_message", 1387 LoadAndLaunchPlatformApp("app_window_send_message",
1388 "APP_WINDOW_CREATE_CALLBACK"); 1388 "APP_WINDOW_CREATE_CALLBACK");
1389 } 1389 }
1390 1390
1391 } // namespace extensions 1391 } // namespace extensions
OLDNEW
« no previous file with comments | « chrome/browser/app_controller_mac.mm ('k') | chrome/browser/apps/app_window_registry_util.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698