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

Side by Side Diff: chrome/browser/ui/cocoa/toolbar/toolbar_controller_unittest.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
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 <Cocoa/Cocoa.h> 5 #import <Cocoa/Cocoa.h>
6 6
7 #import "base/mac/scoped_nsobject.h" 7 #import "base/mac/scoped_nsobject.h"
8 #include "base/macros.h" 8 #include "base/macros.h"
9 #include "base/prefs/pref_service.h"
10 #include "base/run_loop.h" 9 #include "base/run_loop.h"
11 #include "chrome/app/chrome_command_ids.h" 10 #include "chrome/app/chrome_command_ids.h"
12 #include "chrome/browser/command_updater.h" 11 #include "chrome/browser/command_updater.h"
13 #include "chrome/browser/ui/browser.h" 12 #include "chrome/browser/ui/browser.h"
14 #include "chrome/browser/ui/browser_command_controller.h" 13 #include "chrome/browser/ui/browser_command_controller.h"
15 #include "chrome/browser/ui/browser_commands.h" 14 #include "chrome/browser/ui/browser_commands.h"
16 #include "chrome/browser/ui/browser_list.h" 15 #include "chrome/browser/ui/browser_list.h"
17 #include "chrome/browser/ui/browser_list_observer.h" 16 #include "chrome/browser/ui/browser_list_observer.h"
18 #include "chrome/browser/ui/cocoa/cocoa_profile_test.h" 17 #include "chrome/browser/ui/cocoa/cocoa_profile_test.h"
19 #import "chrome/browser/ui/cocoa/image_button_cell.h" 18 #import "chrome/browser/ui/cocoa/image_button_cell.h"
20 #import "chrome/browser/ui/cocoa/toolbar/toolbar_controller.h" 19 #import "chrome/browser/ui/cocoa/toolbar/toolbar_controller.h"
21 #import "chrome/browser/ui/cocoa/view_resizer_pong.h" 20 #import "chrome/browser/ui/cocoa/view_resizer_pong.h"
22 #include "chrome/common/pref_names.h" 21 #include "chrome/common/pref_names.h"
23 #include "chrome/test/base/testing_profile.h" 22 #include "chrome/test/base/testing_profile.h"
23 #include "components/prefs/pref_service.h"
24 #include "testing/gtest/include/gtest/gtest.h" 24 #include "testing/gtest/include/gtest/gtest.h"
25 #import "testing/gtest_mac.h" 25 #import "testing/gtest_mac.h"
26 #include "testing/platform_test.h" 26 #include "testing/platform_test.h"
27 27
28 // An NSView that fakes out hitTest:. 28 // An NSView that fakes out hitTest:.
29 @interface HitView : NSView { 29 @interface HitView : NSView {
30 id hitTestReturn_; 30 id hitTestReturn_;
31 } 31 }
32 @end 32 @end
33 33
(...skipping 359 matching lines...) Expand 10 before | Expand all | Expand 10 after
393 void WaitUntilBrowserRemoved() { run_loop_.Run(); } 393 void WaitUntilBrowserRemoved() { run_loop_.Run(); }
394 void OnBrowserRemoved(Browser* browser) override { run_loop_.Quit(); } 394 void OnBrowserRemoved(Browser* browser) override { run_loop_.Quit(); }
395 395
396 private: 396 private:
397 base::RunLoop run_loop_; 397 base::RunLoop run_loop_;
398 398
399 DISALLOW_COPY_AND_ASSIGN(BrowserRemovedObserver); 399 DISALLOW_COPY_AND_ASSIGN(BrowserRemovedObserver);
400 }; 400 };
401 401
402 } // namespace 402 } // namespace
OLDNEW
« no previous file with comments | « chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm ('k') | chrome/browser/ui/cocoa/view_id_util_browsertest.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698