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

Side by Side Diff: chrome/browser/policy/policy_browsertest.cc

Issue 27207003: Fix declaration vs. implementation ordering in NativeAppWindow{Views|Gtk} (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase again Created 7 years, 2 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 | Annotate | Revision Log
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 <algorithm> 5 #include <algorithm>
6 #include <string> 6 #include <string>
7 #include <vector> 7 #include <vector>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/bind_helpers.h" 10 #include "base/bind_helpers.h"
(...skipping 123 matching lines...) Expand 10 before | Expand all | Expand 10 after
134 #include "ash/accelerators/accelerator_table.h" 134 #include "ash/accelerators/accelerator_table.h"
135 #include "ash/magnifier/magnifier_constants.h" 135 #include "ash/magnifier/magnifier_constants.h"
136 #include "ash/shell.h" 136 #include "ash/shell.h"
137 #include "ash/shell_delegate.h" 137 #include "ash/shell_delegate.h"
138 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h" 138 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h"
139 #include "chrome/browser/chromeos/accessibility/magnification_manager.h" 139 #include "chrome/browser/chromeos/accessibility/magnification_manager.h"
140 #include "chromeos/audio/cras_audio_handler.h" 140 #include "chromeos/audio/cras_audio_handler.h"
141 #endif 141 #endif
142 142
143 #if !defined(OS_MACOSX) 143 #if !defined(OS_MACOSX)
144 #include "apps/native_app_window.h"
145 #include "apps/shell_window.h" 144 #include "apps/shell_window.h"
146 #include "apps/shell_window_registry.h" 145 #include "apps/shell_window_registry.h"
146 #include "apps/ui/native_app_window.h"
147 #include "base/basictypes.h" 147 #include "base/basictypes.h"
148 #include "base/compiler_specific.h" 148 #include "base/compiler_specific.h"
149 #include "chrome/browser/ui/extensions/application_launch.h" 149 #include "chrome/browser/ui/extensions/application_launch.h"
150 #include "ui/base/window_open_disposition.h" 150 #include "ui/base/window_open_disposition.h"
151 #endif 151 #endif
152 152
153 using content::BrowserThread; 153 using content::BrowserThread;
154 using content::URLRequestMockHTTPJob; 154 using content::URLRequestMockHTTPJob;
155 using testing::AnyNumber; 155 using testing::AnyNumber;
156 using testing::Mock; 156 using testing::Mock;
(...skipping 2570 matching lines...) Expand 10 before | Expand all | Expand 10 after
2727 chrome_variations::VariationsService::GetVariationsServerURL( 2727 chrome_variations::VariationsService::GetVariationsServerURL(
2728 g_browser_process->local_state()); 2728 g_browser_process->local_state());
2729 EXPECT_TRUE(StartsWithASCII(url.spec(), default_variations_url, true)); 2729 EXPECT_TRUE(StartsWithASCII(url.spec(), default_variations_url, true));
2730 std::string value; 2730 std::string value;
2731 EXPECT_TRUE(net::GetValueForKeyInQuery(url, "restrict", &value)); 2731 EXPECT_TRUE(net::GetValueForKeyInQuery(url, "restrict", &value));
2732 EXPECT_EQ("restricted", value); 2732 EXPECT_EQ("restricted", value);
2733 } 2733 }
2734 #endif 2734 #endif
2735 2735
2736 } // namespace policy 2736 } // namespace policy
OLDNEW
« no previous file with comments | « chrome/browser/extensions/api/tabs/ash_panel_contents.cc ('k') | chrome/browser/ui/ash/chrome_shell_delegate.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698