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

Side by Side Diff: chrome/browser/extensions/extension_context_menu_model_unittest.cc

Issue 1336993002: Straighten up includes of host_desktop.h/host_desktop_type.h (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@host_desktop_type
Patch Set: Build fixes for Windows and Mac Created 5 years, 3 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 "chrome/browser/extensions/extension_context_menu_model.h" 5 #include "chrome/browser/extensions/extension_context_menu_model.h"
6 6
7 #include "base/strings/utf_string_conversions.h" 7 #include "base/strings/utf_string_conversions.h"
8 #include "chrome/browser/extensions/api/extension_action/extension_action_api.h" 8 #include "chrome/browser/extensions/api/extension_action/extension_action_api.h"
9 #include "chrome/browser/extensions/extension_service.h" 9 #include "chrome/browser/extensions/extension_service.h"
10 #include "chrome/browser/extensions/extension_service_test_base.h" 10 #include "chrome/browser/extensions/extension_service_test_base.h"
(...skipping 10 matching lines...) Expand all
21 #include "extensions/browser/extension_system.h" 21 #include "extensions/browser/extension_system.h"
22 #include "extensions/browser/test_management_policy.h" 22 #include "extensions/browser/test_management_policy.h"
23 #include "extensions/common/extension_builder.h" 23 #include "extensions/common/extension_builder.h"
24 #include "extensions/common/feature_switch.h" 24 #include "extensions/common/feature_switch.h"
25 #include "extensions/common/manifest.h" 25 #include "extensions/common/manifest.h"
26 #include "extensions/common/manifest_constants.h" 26 #include "extensions/common/manifest_constants.h"
27 #include "extensions/common/manifest_handlers/options_page_info.h" 27 #include "extensions/common/manifest_handlers/options_page_info.h"
28 #include "extensions/common/value_builder.h" 28 #include "extensions/common/value_builder.h"
29 #include "testing/gtest/include/gtest/gtest.h" 29 #include "testing/gtest/include/gtest/gtest.h"
30 #include "ui/base/l10n/l10n_util.h" 30 #include "ui/base/l10n/l10n_util.h"
31 #include "ui/gfx/host_desktop_type.h"
31 #include "ui/gfx/image/image.h" 32 #include "ui/gfx/image/image.h"
32 33
33 namespace extensions { 34 namespace extensions {
34 35
35 namespace { 36 namespace {
36 37
37 // Label for test extension menu item. 38 // Label for test extension menu item.
38 const char* kTestExtensionItemLabel = "test-ext-item"; 39 const char* kTestExtensionItemLabel = "test-ext-item";
39 40
40 // Build an extension to pass to the menu constructor, with the an action 41 // Build an extension to pass to the menu constructor, with the an action
(...skipping 331 matching lines...) Expand 10 before | Expand all | Expand 10 after
372 browser_action.get(), 373 browser_action.get(),
373 browser.get(), 374 browser.get(),
374 ExtensionContextMenuModel::TRANSITIVELY_VISIBLE, 375 ExtensionContextMenuModel::TRANSITIVELY_VISIBLE,
375 nullptr); 376 nullptr);
376 index = GetCommandIndex(menu, visibility_command); 377 index = GetCommandIndex(menu, visibility_command);
377 EXPECT_NE(-1, index); 378 EXPECT_NE(-1, index);
378 EXPECT_EQ(redesign_keep_string, menu->GetLabelAt(index)); 379 EXPECT_EQ(redesign_keep_string, menu->GetLabelAt(index));
379 } 380 }
380 381
381 } // namespace extensions 382 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698