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

Side by Side Diff: chrome/browser/app_controller_mac_browsertest.mm

Issue 1658793002: Update chrome for new prefs location. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 10 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_browsertest.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 (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 #import <Carbon/Carbon.h> 5 #import <Carbon/Carbon.h>
6 #import <Cocoa/Cocoa.h> 6 #import <Cocoa/Cocoa.h>
7 #import <Foundation/Foundation.h> 7 #import <Foundation/Foundation.h>
8 #import <Foundation/NSAppleEventDescriptor.h> 8 #import <Foundation/NSAppleEventDescriptor.h>
9 #import <objc/message.h> 9 #import <objc/message.h>
10 #import <objc/runtime.h> 10 #import <objc/runtime.h>
11 #include <stddef.h> 11 #include <stddef.h>
12 12
13 #include "base/command_line.h" 13 #include "base/command_line.h"
14 #include "base/mac/foundation_util.h" 14 #include "base/mac/foundation_util.h"
15 #include "base/mac/scoped_nsobject.h" 15 #include "base/mac/scoped_nsobject.h"
16 #include "base/prefs/pref_service.h"
17 #include "base/run_loop.h" 16 #include "base/run_loop.h"
18 #include "base/strings/sys_string_conversions.h" 17 #include "base/strings/sys_string_conversions.h"
19 #include "base/strings/utf_string_conversions.h" 18 #include "base/strings/utf_string_conversions.h"
20 #include "chrome/app/chrome_command_ids.h" 19 #include "chrome/app/chrome_command_ids.h"
21 #import "chrome/browser/app_controller_mac.h" 20 #import "chrome/browser/app_controller_mac.h"
22 #include "chrome/browser/apps/app_browsertest_util.h" 21 #include "chrome/browser/apps/app_browsertest_util.h"
23 #include "chrome/browser/bookmarks/bookmark_model_factory.h" 22 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
24 #include "chrome/browser/browser_process.h" 23 #include "chrome/browser/browser_process.h"
25 #include "chrome/browser/history/history_service_factory.h" 24 #include "chrome/browser/history/history_service_factory.h"
26 #include "chrome/browser/profiles/profile_manager.h" 25 #include "chrome/browser/profiles/profile_manager.h"
27 #include "chrome/browser/ui/browser.h" 26 #include "chrome/browser/ui/browser.h"
28 #include "chrome/browser/ui/browser_list.h" 27 #include "chrome/browser/ui/browser_list.h"
29 #include "chrome/browser/ui/browser_navigator_params.h" 28 #include "chrome/browser/ui/browser_navigator_params.h"
30 #include "chrome/browser/ui/browser_window.h" 29 #include "chrome/browser/ui/browser_window.h"
31 #include "chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge.h" 30 #include "chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge.h"
32 #include "chrome/browser/ui/cocoa/history_menu_bridge.h" 31 #include "chrome/browser/ui/cocoa/history_menu_bridge.h"
33 #include "chrome/browser/ui/cocoa/run_loop_testing.h" 32 #include "chrome/browser/ui/cocoa/run_loop_testing.h"
34 #include "chrome/browser/ui/host_desktop.h" 33 #include "chrome/browser/ui/host_desktop.h"
35 #include "chrome/browser/ui/tabs/tab_strip_model.h" 34 #include "chrome/browser/ui/tabs/tab_strip_model.h"
36 #include "chrome/browser/ui/user_manager.h" 35 #include "chrome/browser/ui/user_manager.h"
37 #include "chrome/common/chrome_constants.h" 36 #include "chrome/common/chrome_constants.h"
38 #include "chrome/common/chrome_switches.h" 37 #include "chrome/common/chrome_switches.h"
39 #include "chrome/common/pref_names.h" 38 #include "chrome/common/pref_names.h"
40 #include "chrome/common/url_constants.h" 39 #include "chrome/common/url_constants.h"
41 #include "chrome/test/base/in_process_browser_test.h" 40 #include "chrome/test/base/in_process_browser_test.h"
42 #include "chrome/test/base/ui_test_utils.h" 41 #include "chrome/test/base/ui_test_utils.h"
43 #include "components/bookmarks/browser/bookmark_model.h" 42 #include "components/bookmarks/browser/bookmark_model.h"
44 #include "components/bookmarks/test/bookmark_test_helpers.h" 43 #include "components/bookmarks/test/bookmark_test_helpers.h"
44 #include "components/prefs/pref_service.h"
45 #include "components/signin/core/common/profile_management_switches.h" 45 #include "components/signin/core/common/profile_management_switches.h"
46 #include "content/public/browser/web_contents.h" 46 #include "content/public/browser/web_contents.h"
47 #include "content/public/test/browser_test_utils.h" 47 #include "content/public/test/browser_test_utils.h"
48 #include "content/public/test/test_navigation_observer.h" 48 #include "content/public/test/test_navigation_observer.h"
49 #include "extensions/browser/app_window/app_window_registry.h" 49 #include "extensions/browser/app_window/app_window_registry.h"
50 #include "extensions/common/extension.h" 50 #include "extensions/common/extension.h"
51 #include "extensions/test/extension_test_message_listener.h" 51 #include "extensions/test/extension_test_message_listener.h"
52 #include "net/test/embedded_test_server/embedded_test_server.h" 52 #include "net/test/embedded_test_server/embedded_test_server.h"
53 53
54 namespace { 54 namespace {
(...skipping 631 matching lines...) Expand 10 before | Expand all | Expand 10 after
686 ui_test_utils::NavigateToURL(browser3, test_url1); 686 ui_test_utils::NavigateToURL(browser3, test_url1);
687 EXPECT_EQ(g_handoff_url, GURL()); 687 EXPECT_EQ(g_handoff_url, GURL());
688 688
689 // Activate the original browser window. 689 // Activate the original browser window.
690 Browser* browser1 = active_browser_list->get(0); 690 Browser* browser1 = active_browser_list->get(0);
691 browser1->window()->Show(); 691 browser1->window()->Show();
692 EXPECT_EQ(g_handoff_url, test_url2); 692 EXPECT_EQ(g_handoff_url, test_url2);
693 } 693 }
694 694
695 } // namespace 695 } // namespace
OLDNEW
« no previous file with comments | « chrome/browser/app_controller_mac.mm ('k') | chrome/browser/apps/app_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698