| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 <gtk/gtk.h> | 5 #include <gtk/gtk.h> |
| 6 | 6 |
| 7 #include "chrome/browser/ui/browser.h" | 7 #include "chrome/browser/ui/browser.h" |
| 8 #include "chrome/browser/ui/browser_window.h" | 8 #include "chrome/browser/ui/browser_window.h" |
| 9 #include "chrome/browser/ui/gtk/view_id_util.h" | 9 #include "chrome/browser/ui/gtk/view_id_util.h" |
| 10 #include "chrome/common/url_constants.h" | 10 #include "chrome/common/url_constants.h" |
| (...skipping 23 matching lines...) Expand all Loading... |
| 34 | 34 |
| 35 for (int i = VIEW_ID_TOOLBAR; i < VIEW_ID_PREDEFINED_COUNT; ++i) { | 35 for (int i = VIEW_ID_TOOLBAR; i < VIEW_ID_PREDEFINED_COUNT; ++i) { |
| 36 // The following ids are used only in views implementation. | 36 // The following ids are used only in views implementation. |
| 37 if (i == VIEW_ID_CONTENTS_SPLIT || | 37 if (i == VIEW_ID_CONTENTS_SPLIT || |
| 38 i == VIEW_ID_INFO_BAR_CONTAINER || | 38 i == VIEW_ID_INFO_BAR_CONTAINER || |
| 39 i == VIEW_ID_DOWNLOAD_SHELF || | 39 i == VIEW_ID_DOWNLOAD_SHELF || |
| 40 i == VIEW_ID_BOOKMARK_BAR_ELEMENT || | 40 i == VIEW_ID_BOOKMARK_BAR_ELEMENT || |
| 41 i == VIEW_ID_TAB || | 41 i == VIEW_ID_TAB || |
| 42 i == VIEW_ID_SIDE_BAR_CONTAINER || | 42 i == VIEW_ID_SIDE_BAR_CONTAINER || |
| 43 i == VIEW_ID_SIDE_BAR_SPLIT || | 43 i == VIEW_ID_SIDE_BAR_SPLIT || |
| 44 i == VIEW_ID_FEEDBACK_BUTTON) { | 44 i == VIEW_ID_FEEDBACK_BUTTON || |
| 45 i == VIEW_ID_OMNIBOX) { |
| 45 continue; | 46 continue; |
| 46 } | 47 } |
| 47 | 48 |
| 48 CheckViewID(static_cast<ViewID>(i), true); | 49 CheckViewID(static_cast<ViewID>(i), true); |
| 49 } | 50 } |
| 50 | 51 |
| 51 CheckViewID(VIEW_ID_PREDEFINED_COUNT, false); | 52 CheckViewID(VIEW_ID_PREDEFINED_COUNT, false); |
| 52 } | 53 } |
| 53 | 54 |
| 54 IN_PROC_BROWSER_TEST_F(ViewIDTest, Delegate) { | 55 IN_PROC_BROWSER_TEST_F(ViewIDTest, Delegate) { |
| 55 CheckViewID(VIEW_ID_TAB_0, true); | 56 CheckViewID(VIEW_ID_TAB_0, true); |
| 56 CheckViewID(VIEW_ID_TAB_1, false); | 57 CheckViewID(VIEW_ID_TAB_1, false); |
| 57 | 58 |
| 58 browser()->OpenURL(OpenURLParams(GURL(chrome::kAboutBlankURL), | 59 browser()->OpenURL(OpenURLParams(GURL(chrome::kAboutBlankURL), |
| 59 content::Referrer(), | 60 content::Referrer(), |
| 60 NEW_BACKGROUND_TAB, content::PAGE_TRANSITION_TYPED, | 61 NEW_BACKGROUND_TAB, content::PAGE_TRANSITION_TYPED, |
| 61 false)); | 62 false)); |
| 62 | 63 |
| 63 CheckViewID(VIEW_ID_TAB_0, true); | 64 CheckViewID(VIEW_ID_TAB_0, true); |
| 64 CheckViewID(VIEW_ID_TAB_1, true); | 65 CheckViewID(VIEW_ID_TAB_1, true); |
| 65 } | 66 } |
| OLD | NEW |