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

Side by Side Diff: chrome/browser/ui/cocoa/cocoa_profile_test.mm

Issue 10702029: Move tab functions off Browser into browser_tabstrip and browser_tabrestore. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 5 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/cocoa/cocoa_profile_test.h" 5 #include "chrome/browser/ui/cocoa/cocoa_profile_test.h"
6 6
7 #include "chrome/browser/autocomplete/autocomplete_classifier_factory.h" 7 #include "chrome/browser/autocomplete/autocomplete_classifier_factory.h"
8 #include "chrome/browser/browser_process.h" 8 #include "chrome/browser/browser_process.h"
9 #include "chrome/browser/search_engines/template_url_service_factory.h" 9 #include "chrome/browser/search_engines/template_url_service_factory.h"
10 #include "chrome/browser/ui/browser_commands.h" 10 #include "chrome/browser/ui/browser_commands.h"
11 #include "chrome/browser/ui/browser_tabstrip.h"
11 #include "chrome/test/base/testing_browser_process.h" 12 #include "chrome/test/base/testing_browser_process.h"
12 #include "content/public/test/test_browser_thread.h" 13 #include "content/public/test/test_browser_thread.h"
13 14
14 using content::BrowserThread; 15 using content::BrowserThread;
15 16
16 CocoaProfileTest::CocoaProfileTest() 17 CocoaProfileTest::CocoaProfileTest()
17 : ui_thread_(BrowserThread::UI, &message_loop_), 18 : ui_thread_(BrowserThread::UI, &message_loop_),
18 profile_manager_(static_cast<TestingBrowserProcess*>(g_browser_process)), 19 profile_manager_(static_cast<TestingBrowserProcess*>(g_browser_process)),
19 profile_(NULL), 20 profile_(NULL),
20 file_user_blocking_thread_(new content::TestBrowserThread( 21 file_user_blocking_thread_(new content::TestBrowserThread(
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
82 } 83 }
83 84
84 BrowserWindow* CocoaProfileTest::CreateBrowserWindow() { 85 BrowserWindow* CocoaProfileTest::CreateBrowserWindow() {
85 browser_->InitBrowserWindow(); 86 browser_->InitBrowserWindow();
86 return browser_->window(); 87 return browser_->window();
87 } 88 }
88 89
89 void CocoaProfileTest::CloseBrowserWindow() { 90 void CocoaProfileTest::CloseBrowserWindow() {
90 // Check to make sure a window was actually created. 91 // Check to make sure a window was actually created.
91 DCHECK(browser_->window()); 92 DCHECK(browser_->window());
92 browser_->CloseAllTabs(); 93 chrome::CloseAllTabs(browser_.get());
93 chrome::CloseWindow(browser_.get()); 94 chrome::CloseWindow(browser_.get());
94 // |browser_| will be deleted by its BrowserWindowController. 95 // |browser_| will be deleted by its BrowserWindowController.
95 ignore_result(browser_.release()); 96 ignore_result(browser_.release());
96 } 97 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698