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

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

Issue 108213012: [DevTools] Remove dock side knowledge from browser. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: More test magic Created 6 years, 11 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 "base/basictypes.h" 5 #include "base/basictypes.h"
6 #include "base/command_line.h" 6 #include "base/command_line.h"
7 #include "base/prefs/pref_service.h" 7 #include "base/prefs/pref_service.h"
8 #include "base/strings/utf_string_conversions.h" 8 #include "base/strings/utf_string_conversions.h"
9 #include "chrome/browser/bookmarks/bookmark_model.h" 9 #include "chrome/browser/bookmarks/bookmark_model.h"
10 #include "chrome/browser/bookmarks/bookmark_model_factory.h" 10 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
11 #include "chrome/browser/bookmarks/bookmark_test_helpers.h" 11 #include "chrome/browser/bookmarks/bookmark_test_helpers.h"
12 #include "chrome/browser/bookmarks/bookmark_utils.h" 12 #include "chrome/browser/bookmarks/bookmark_utils.h"
13 #include "chrome/browser/devtools/devtools_window.h"
13 #include "chrome/browser/download/download_shelf.h" 14 #include "chrome/browser/download/download_shelf.h"
14 #include "chrome/browser/profiles/profile.h" 15 #include "chrome/browser/profiles/profile.h"
15 #include "chrome/browser/ui/browser.h" 16 #include "chrome/browser/ui/browser.h"
16 #include "chrome/browser/ui/browser_commands.h" 17 #include "chrome/browser/ui/browser_commands.h"
17 #include "chrome/browser/ui/browser_window.h" 18 #include "chrome/browser/ui/browser_window.h"
18 #include "chrome/browser/ui/cocoa/view_id_util.h" 19 #include "chrome/browser/ui/cocoa/view_id_util.h"
19 #include "chrome/common/pref_names.h" 20 #include "chrome/common/pref_names.h"
20 #include "chrome/common/url_constants.h" 21 #include "chrome/common/url_constants.h"
21 #include "chrome/test/base/in_process_browser_test.h" 22 #include "chrome/test/base/in_process_browser_test.h"
22 #include "extensions/common/switches.h" 23 #include "extensions/common/switches.h"
(...skipping 17 matching lines...) Expand all
40 NSView* view = view_id_util::GetView(root_window_, view_id); 41 NSView* view = view_id_util::GetView(root_window_, view_id);
41 EXPECT_EQ(should_have, !!view) << " Failed id=" << view_id; 42 EXPECT_EQ(should_have, !!view) << " Failed id=" << view_id;
42 } 43 }
43 44
44 void DoTest() { 45 void DoTest() {
45 // Make sure FindBar is created to test 46 // Make sure FindBar is created to test
46 // VIEW_ID_FIND_IN_PAGE_TEXT_FIELD and VIEW_ID_FIND_IN_PAGE. 47 // VIEW_ID_FIND_IN_PAGE_TEXT_FIELD and VIEW_ID_FIND_IN_PAGE.
47 chrome::ShowFindBar(browser()); 48 chrome::ShowFindBar(browser());
48 49
49 // Make sure docked devtools is created to test VIEW_ID_DEV_TOOLS_DOCKED 50 // Make sure docked devtools is created to test VIEW_ID_DEV_TOOLS_DOCKED
50 browser()->profile()->GetPrefs()->SetString(prefs::kDevToolsDockSide, 51 DevToolsWindow* devtools = DevToolsWindow::ToggleDevToolsWindow(
51 "dock_bottom"); 52 browser(), DevToolsToggleAction::Inspect());
52 chrome::ToggleDevToolsWindow(browser(), DevToolsToggleAction::Inspect()); 53 devtools->SetIsDockedAndShowImmediatelyForTest(true);
pfeldman 2014/01/09 12:52:01 Could you inline the one above into this method to
dgozman 2014/01/14 15:26:17 Done.
53 54
54 // Make sure download shelf is created to test VIEW_ID_DOWNLOAD_SHELF 55 // Make sure download shelf is created to test VIEW_ID_DOWNLOAD_SHELF
55 browser()->window()->GetDownloadShelf()->Show(); 56 browser()->window()->GetDownloadShelf()->Show();
56 57
57 // Create a bookmark to test VIEW_ID_BOOKMARK_BAR_ELEMENT 58 // Create a bookmark to test VIEW_ID_BOOKMARK_BAR_ELEMENT
58 BookmarkModel* bookmark_model = 59 BookmarkModel* bookmark_model =
59 BookmarkModelFactory::GetForProfile(browser()->profile()); 60 BookmarkModelFactory::GetForProfile(browser()->profile());
60 if (bookmark_model) { 61 if (bookmark_model) {
61 if (!bookmark_model->loaded()) 62 if (!bookmark_model->loaded())
62 test::WaitForBookmarkModelToLoad(bookmark_model); 63 test::WaitForBookmarkModelToLoad(bookmark_model);
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
114 // VIEW_ID_TAB_LAST should always be available. 115 // VIEW_ID_TAB_LAST should always be available.
115 CheckViewID(VIEW_ID_TAB_LAST, true); 116 CheckViewID(VIEW_ID_TAB_LAST, true);
116 } 117 }
117 118
118 // Open the 11th tab. 119 // Open the 11th tab.
119 browser()->OpenURL(OpenURLParams( 120 browser()->OpenURL(OpenURLParams(
120 GURL(content::kAboutBlankURL), Referrer(), NEW_BACKGROUND_TAB, 121 GURL(content::kAboutBlankURL), Referrer(), NEW_BACKGROUND_TAB,
121 content::PAGE_TRANSITION_TYPED, false)); 122 content::PAGE_TRANSITION_TYPED, false));
122 CheckViewID(VIEW_ID_TAB_LAST, true); 123 CheckViewID(VIEW_ID_TAB_LAST, true);
123 } 124 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698