| OLD | NEW |
| 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 <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_commands.h" | 8 #include "chrome/browser/ui/browser_commands.h" |
| 9 #include "chrome/browser/ui/browser_window.h" | 9 #include "chrome/browser/ui/browser_window.h" |
| 10 #include "chrome/browser/ui/gtk/view_id_util.h" | 10 #include "chrome/browser/ui/gtk/view_id_util.h" |
| (...skipping 27 matching lines...) Expand all Loading... |
| 38 for (int i = VIEW_ID_TOOLBAR; i < VIEW_ID_PREDEFINED_COUNT; ++i) { | 38 for (int i = VIEW_ID_TOOLBAR; i < VIEW_ID_PREDEFINED_COUNT; ++i) { |
| 39 // The following ids are used only in views implementation. | 39 // The following ids are used only in views implementation. |
| 40 if (i == VIEW_ID_CONTENTS_SPLIT || | 40 if (i == VIEW_ID_CONTENTS_SPLIT || |
| 41 i == VIEW_ID_INFO_BAR_CONTAINER || | 41 i == VIEW_ID_INFO_BAR_CONTAINER || |
| 42 i == VIEW_ID_DEV_TOOLS_DOCKED || | 42 i == VIEW_ID_DEV_TOOLS_DOCKED || |
| 43 i == VIEW_ID_DOWNLOAD_SHELF || | 43 i == VIEW_ID_DOWNLOAD_SHELF || |
| 44 i == VIEW_ID_BOOKMARK_BAR_ELEMENT || | 44 i == VIEW_ID_BOOKMARK_BAR_ELEMENT || |
| 45 i == VIEW_ID_TAB || | 45 i == VIEW_ID_TAB || |
| 46 i == VIEW_ID_FEEDBACK_BUTTON || | 46 i == VIEW_ID_FEEDBACK_BUTTON || |
| 47 i == VIEW_ID_SCRIPT_BUBBLE || | 47 i == VIEW_ID_SCRIPT_BUBBLE || |
| 48 i == VIEW_ID_MIC_SEARCH_BUTTON) { | 48 i == VIEW_ID_MIC_SEARCH_BUTTON || |
| 49 i == VIEW_ID_TRANSLATE_BUTTON) { |
| 49 continue; | 50 continue; |
| 50 } | 51 } |
| 51 | 52 |
| 52 CheckViewID(static_cast<ViewID>(i), true); | 53 CheckViewID(static_cast<ViewID>(i), true); |
| 53 } | 54 } |
| 54 | 55 |
| 55 CheckViewID(VIEW_ID_PREDEFINED_COUNT, false); | 56 CheckViewID(VIEW_ID_PREDEFINED_COUNT, false); |
| 56 } | 57 } |
| 57 | 58 |
| 58 IN_PROC_BROWSER_TEST_F(ViewIDTest, Delegate) { | 59 IN_PROC_BROWSER_TEST_F(ViewIDTest, Delegate) { |
| 59 CheckViewID(VIEW_ID_TAB_0, true); | 60 CheckViewID(VIEW_ID_TAB_0, true); |
| 60 CheckViewID(VIEW_ID_TAB_1, false); | 61 CheckViewID(VIEW_ID_TAB_1, false); |
| 61 | 62 |
| 62 browser()->OpenURL(OpenURLParams(GURL(content::kAboutBlankURL), | 63 browser()->OpenURL(OpenURLParams(GURL(content::kAboutBlankURL), |
| 63 content::Referrer(), | 64 content::Referrer(), |
| 64 NEW_BACKGROUND_TAB, content::PAGE_TRANSITION_TYPED, | 65 NEW_BACKGROUND_TAB, content::PAGE_TRANSITION_TYPED, |
| 65 false)); | 66 false)); |
| 66 | 67 |
| 67 CheckViewID(VIEW_ID_TAB_0, true); | 68 CheckViewID(VIEW_ID_TAB_0, true); |
| 68 CheckViewID(VIEW_ID_TAB_1, true); | 69 CheckViewID(VIEW_ID_TAB_1, true); |
| 69 } | 70 } |
| OLD | NEW |