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

Side by Side Diff: chrome/browser/translate/translate_manager_render_view_host_unittest.cc

Issue 1545223002: Switch to standard integer types in chrome/browser/, part 4 of 4. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix Created 4 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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 <stddef.h>
6
5 #include <algorithm> 7 #include <algorithm>
6 #include <set> 8 #include <set>
7 #include <vector> 9 #include <vector>
8 10
9 #include "base/macros.h" 11 #include "base/macros.h"
10 #include "base/memory/scoped_ptr.h" 12 #include "base/memory/scoped_ptr.h"
11 #include "base/prefs/pref_change_registrar.h" 13 #include "base/prefs/pref_change_registrar.h"
12 #include "base/prefs/pref_service.h" 14 #include "base/prefs/pref_service.h"
13 #include "base/strings/stringprintf.h" 15 #include "base/strings/stringprintf.h"
16 #include "build/build_config.h"
14 #include "chrome/app/chrome_command_ids.h" 17 #include "chrome/app/chrome_command_ids.h"
15 #include "chrome/browser/chrome_notification_types.h" 18 #include "chrome/browser/chrome_notification_types.h"
16 #include "chrome/browser/extensions/test_extension_system.h" 19 #include "chrome/browser/extensions/test_extension_system.h"
17 #include "chrome/browser/infobars/infobar_service.h" 20 #include "chrome/browser/infobars/infobar_service.h"
18 #include "chrome/browser/renderer_context_menu/render_view_context_menu_test_uti l.h" 21 #include "chrome/browser/renderer_context_menu/render_view_context_menu_test_uti l.h"
19 #include "chrome/browser/translate/chrome_translate_client.h" 22 #include "chrome/browser/translate/chrome_translate_client.h"
20 #include "chrome/browser/translate/translate_service.h" 23 #include "chrome/browser/translate/translate_service.h"
21 #include "chrome/browser/ui/translate/translate_bubble_factory.h" 24 #include "chrome/browser/ui/translate/translate_bubble_factory.h"
22 #include "chrome/browser/ui/translate/translate_bubble_model.h" 25 #include "chrome/browser/ui/translate/translate_bubble_model.h"
23 #include "chrome/browser/ui/translate/translate_bubble_model_impl.h" 26 #include "chrome/browser/ui/translate/translate_bubble_model_impl.h"
(...skipping 1652 matching lines...) Expand 10 before | Expand all | Expand 10 after
1676 1679
1677 // Check the bubble exists instead of the infobar. 1680 // Check the bubble exists instead of the infobar.
1678 translate::TranslateInfoBarDelegate* infobar = GetTranslateInfoBar(); 1681 translate::TranslateInfoBarDelegate* infobar = GetTranslateInfoBar();
1679 ASSERT_TRUE(infobar == NULL); 1682 ASSERT_TRUE(infobar == NULL);
1680 TranslateBubbleModel* bubble = factory->model(); 1683 TranslateBubbleModel* bubble = factory->model();
1681 ASSERT_TRUE(bubble != NULL); 1684 ASSERT_TRUE(bubble != NULL);
1682 EXPECT_EQ(TranslateBubbleModel::VIEW_STATE_TRANSLATING, 1685 EXPECT_EQ(TranslateBubbleModel::VIEW_STATE_TRANSLATING,
1683 bubble->GetViewState()); 1686 bubble->GetViewState());
1684 } 1687 }
1685 #endif // defined(USE_AURA) 1688 #endif // defined(USE_AURA)
OLDNEW
« no previous file with comments | « chrome/browser/translate/translate_manager_browsertest.cc ('k') | chrome/browser/translate/translate_service.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698