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

Side by Side Diff: chrome_frame/chrome_frame_npapi.cc

Issue 3447008: base: Finish moving the SplitString functions from string_util.h to string_split.h (Closed) Base URL: git://git.chromium.org/chromium.git
Patch Set: chromeos fixes Created 10 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
« no previous file with comments | « chrome_frame/chrome_frame_activex.cc ('k') | chrome_frame/metrics_service.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 "chrome_frame/chrome_frame_npapi.h" 5 #include "chrome_frame/chrome_frame_npapi.h"
6 6
7 #include "base/basictypes.h" 7 #include "base/basictypes.h"
8 #include "base/logging.h" 8 #include "base/logging.h"
9 #include "base/message_loop.h" 9 #include "base/message_loop.h"
10 #include "base/string_split.h"
10 #include "base/string_util.h" 11 #include "base/string_util.h"
11 #include "base/utf_string_conversions.h" 12 #include "base/utf_string_conversions.h"
12 #include "chrome/test/automation/tab_proxy.h" 13 #include "chrome/test/automation/tab_proxy.h"
13 #include "chrome_frame/ff_privilege_check.h" 14 #include "chrome_frame/ff_privilege_check.h"
14 #include "chrome_frame/np_utils.h" 15 #include "chrome_frame/np_utils.h"
15 #include "chrome_frame/scoped_ns_ptr_win.h" 16 #include "chrome_frame/scoped_ns_ptr_win.h"
16 #include "chrome_frame/utils.h" 17 #include "chrome_frame/utils.h"
17 18
18 MessageLoop* ChromeFrameNPAPI::message_loop_ = NULL; 19 MessageLoop* ChromeFrameNPAPI::message_loop_ = NULL;
19 int ChromeFrameNPAPI::instance_count_ = 0; 20 int ChromeFrameNPAPI::instance_count_ = 0;
(...skipping 1429 matching lines...) Expand 10 before | Expand all | Expand 10 after
1449 } 1450 }
1450 1451
1451 int32 ChromeFrameNPAPI::Write(NPStream* stream, int32 offset, int32 len, 1452 int32 ChromeFrameNPAPI::Write(NPStream* stream, int32 offset, int32 len,
1452 void* buffer) { 1453 void* buffer) {
1453 return url_fetcher_.Write(stream, offset, len, buffer); 1454 return url_fetcher_.Write(stream, offset, len, buffer);
1454 } 1455 }
1455 1456
1456 NPError ChromeFrameNPAPI::DestroyStream(NPStream* stream, NPReason reason) { 1457 NPError ChromeFrameNPAPI::DestroyStream(NPStream* stream, NPReason reason) {
1457 return url_fetcher_.DestroyStream(stream, reason); 1458 return url_fetcher_.DestroyStream(stream, reason);
1458 } 1459 }
OLDNEW
« no previous file with comments | « chrome_frame/chrome_frame_activex.cc ('k') | chrome_frame/metrics_service.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698