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

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

Issue 5089001: Cleanup: Include browser.h -> ui/browser.h [Part 3]. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixes. Created 10 years, 1 month 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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 "build/build_config.h" 5 #include "build/build_config.h"
6 6
7 #if defined(TOOLKIT_GTK) 7 #if defined(TOOLKIT_GTK)
8 #include <gtk/gtk.h> 8 #include <gtk/gtk.h>
9 #endif 9 #endif
10 10
11 #include "chrome/browser/browser.h"
12 #include "chrome/browser/browser_window.h" 11 #include "chrome/browser/browser_window.h"
13 #include "chrome/browser/extensions/browser_action_test_util.h" 12 #include "chrome/browser/extensions/browser_action_test_util.h"
14 #include "chrome/browser/extensions/extension_apitest.h" 13 #include "chrome/browser/extensions/extension_apitest.h"
15 #include "chrome/browser/extensions/extension_browser_event_router.h" 14 #include "chrome/browser/extensions/extension_browser_event_router.h"
16 #include "chrome/browser/extensions/extension_tabs_module.h" 15 #include "chrome/browser/extensions/extension_tabs_module.h"
17 #include "chrome/browser/extensions/extensions_service.h" 16 #include "chrome/browser/extensions/extensions_service.h"
18 #include "chrome/browser/profile.h" 17 #include "chrome/browser/profile.h"
19 #include "chrome/browser/tab_contents/tab_contents.h" 18 #include "chrome/browser/tab_contents/tab_contents.h"
19 #include "chrome/browser/ui/browser.h"
20 #include "chrome/common/chrome_switches.h" 20 #include "chrome/common/chrome_switches.h"
21 #include "chrome/common/extensions/extension_action.h" 21 #include "chrome/common/extensions/extension_action.h"
22 #include "chrome/common/url_constants.h" 22 #include "chrome/common/url_constants.h"
23 #include "chrome/test/ui_test_utils.h" 23 #include "chrome/test/ui_test_utils.h"
24 #include "gfx/rect.h" 24 #include "gfx/rect.h"
25 #include "gfx/size.h" 25 #include "gfx/size.h"
26 26
27 class BrowserActionApiTest : public ExtensionApiTest { 27 class BrowserActionApiTest : public ExtensionApiTest {
28 public: 28 public:
29 BrowserActionApiTest() {} 29 BrowserActionApiTest() {}
(...skipping 332 matching lines...) Expand 10 before | Expand all | Expand 10 after
362 service->toolbar_model()->MoveBrowserAction( 362 service->toolbar_model()->MoveBrowserAction(
363 service->extensions()->at(size_before + 1), 1); 363 service->extensions()->at(size_before + 1), 1);
364 364
365 EXPECT_EQ(kTooltipC, GetBrowserActionsBar().GetTooltip(0)); 365 EXPECT_EQ(kTooltipC, GetBrowserActionsBar().GetTooltip(0));
366 EXPECT_EQ(kTooltipB, GetBrowserActionsBar().GetTooltip(1)); 366 EXPECT_EQ(kTooltipB, GetBrowserActionsBar().GetTooltip(1));
367 EXPECT_EQ(kTooltipA, GetBrowserActionsBar().GetTooltip(2)); 367 EXPECT_EQ(kTooltipA, GetBrowserActionsBar().GetTooltip(2));
368 368
369 EXPECT_EQ(kTooltipC, incognito_bar.GetTooltip(0)); 369 EXPECT_EQ(kTooltipC, incognito_bar.GetTooltip(0));
370 EXPECT_EQ(kTooltipA, incognito_bar.GetTooltip(1)); 370 EXPECT_EQ(kTooltipA, incognito_bar.GetTooltip(1));
371 } 371 }
OLDNEW
« no previous file with comments | « chrome/browser/extensions/app_process_apitest.cc ('k') | chrome/browser/extensions/browser_action_test_util_gtk.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698